La page des compétences utilisateurs:
Une alerte à l'éditon impossible. Quand l'activité n'est pas choisie, les compétences associées n'existent pas, et l'utilisateur ne peux pas les saisir dans la page do/UserSKills. Cette en averti l'utilisateur, et lui propose l'edition de son profile. * AccountController.cs: doc xml * CircleController.cs: renommage * style.css: nettoyage * FrontOfficeController.cs: alerte à l'edition de compétence sans avoir choisi d'activité * UserList.aspx: Un titre à la liste des utilisateurs
This commit is contained in:
@ -107,6 +107,10 @@ namespace Yavsc.ApiControllers
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Adds the user to role.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="model">Model.</param>
|
||||||
[ValidateAjax]
|
[ValidateAjax]
|
||||||
[Authorize(Roles="Admin")]
|
[Authorize(Roles="Admin")]
|
||||||
public void AddUserToRole(UserRole model)
|
public void AddUserToRole(UserRole model)
|
||||||
@ -115,6 +119,10 @@ namespace Yavsc.ApiControllers
|
|||||||
Roles.AddUserToRole (model.UserName, model.Role);
|
Roles.AddUserToRole (model.UserName, model.Role);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Removes the user from role.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="model">Model.</param>
|
||||||
[ValidateAjax]
|
[ValidateAjax]
|
||||||
[Authorize(Roles="Admin")]
|
[Authorize(Roles="Admin")]
|
||||||
public void RemoveUserFromRole(UserRole model)
|
public void RemoveUserFromRole(UserRole model)
|
||||||
|
@ -55,7 +55,7 @@ namespace Yavsc.ApiControllers
|
|||||||
/// <param name="username">username.</param>
|
/// <param name="username">username.</param>
|
||||||
[Authorize,
|
[Authorize,
|
||||||
AcceptVerbs ("POST")]
|
AcceptVerbs ("POST")]
|
||||||
public void Add(long id, string username)
|
public void AddUserToCircle(long id, string username)
|
||||||
{
|
{
|
||||||
checkIsOwner (CircleManager.DefaultProvider.Get (id));
|
checkIsOwner (CircleManager.DefaultProvider.Get (id));
|
||||||
CircleManager.DefaultProvider.AddMember (id, username);
|
CircleManager.DefaultProvider.AddMember (id, username);
|
||||||
|
@ -431,7 +431,6 @@ header h1, header a { padding:.2em;}
|
|||||||
.c2 { display:none; }
|
.c2 { display:none; }
|
||||||
.c2-alt { display:initial; }
|
.c2-alt { display:initial; }
|
||||||
|
|
||||||
fa::children() { display:none; }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,3 +1,16 @@
|
|||||||
|
2015-12-03 Paul Schneider <paul@pschneider.fr>
|
||||||
|
|
||||||
|
* AccountController.cs: doc xml
|
||||||
|
|
||||||
|
* CircleController.cs: renommage
|
||||||
|
|
||||||
|
* style.css: nettoyage
|
||||||
|
|
||||||
|
* FrontOfficeController.cs: alerte à l'edition de compétence
|
||||||
|
sans avoir choisi d'activité
|
||||||
|
|
||||||
|
* UserList.aspx: Un titre à la liste des utilisateurs
|
||||||
|
|
||||||
2015-12-03 Paul Schneider <paul@pschneider.fr>
|
2015-12-03 Paul Schneider <paul@pschneider.fr>
|
||||||
|
|
||||||
* Yavsc.csproj:
|
* Yavsc.csproj:
|
||||||
|
@ -333,6 +333,16 @@ namespace Yavsc.Controllers
|
|||||||
// actually performed via the Web API :-°
|
// actually performed via the Web API :-°
|
||||||
// else if (ModelState.IsValid) {}
|
// else if (ModelState.IsValid) {}
|
||||||
var usp = SkillManager.GetUserSkills (id);
|
var usp = SkillManager.GetUserSkills (id);
|
||||||
|
var mea = usp.MEACode;
|
||||||
|
// TODO add a route parameter to the profile method,
|
||||||
|
// named "fs" (standing for fieldset)
|
||||||
|
// That filters the view in order to only edit the given fieldset
|
||||||
|
|
||||||
|
if (mea == "none")
|
||||||
|
YavscHelpers.Notify (ViewData, "Vous devez choisir une activité avant de pouvoir déclarer vos compétences " +
|
||||||
|
"(Editez la rubrique <a href=\"" +
|
||||||
|
Url.RouteUrl ("Default", new { controller = "Account", action = "Profile", id = User.Identity.Name, fs="infopub" }) + "\">Informations publiques</a> votre profile)");
|
||||||
|
|
||||||
var skills = SkillManager.FindSkill ("%",usp.MEACode);
|
var skills = SkillManager.FindSkill ("%",usp.MEACode);
|
||||||
ViewData ["SiteSkills"] = skills;
|
ViewData ["SiteSkills"] = skills;
|
||||||
return View (usp);
|
return View (usp);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage<System.Web.Security.MembershipUserCollection>" MasterPageFile="~/Models/AppAdmin.master" %>
|
<%@ Page Title="User_List" Language="C#" Inherits="System.Web.Mvc.ViewPage<System.Web.Security.MembershipUserCollection>" MasterPageFile="~/Models/AppAdmin.master" %>
|
||||||
<asp:Content ContentPlaceHolderID="init" ID="init1" runat="server">
|
<asp:Content ContentPlaceHolderID="init" ID="init1" runat="server">
|
||||||
<% Page.Title = LocalizedText.User_List; %>
|
<% Page.Title = LocalizedText.User_List; %>
|
||||||
</asp:Content>
|
</asp:Content>
|
||||||
|
Reference in New Issue
Block a user