diff --git a/web/ApiControllers/AccountController.cs b/web/ApiControllers/AccountController.cs index bb3c6c7b..7542e9f6 100644 --- a/web/ApiControllers/AccountController.cs +++ b/web/ApiControllers/AccountController.cs @@ -107,6 +107,10 @@ namespace Yavsc.ApiControllers } } + /// + /// Adds the user to role. + /// + /// Model. [ValidateAjax] [Authorize(Roles="Admin")] public void AddUserToRole(UserRole model) @@ -115,6 +119,10 @@ namespace Yavsc.ApiControllers Roles.AddUserToRole (model.UserName, model.Role); } + /// + /// Removes the user from role. + /// + /// Model. [ValidateAjax] [Authorize(Roles="Admin")] public void RemoveUserFromRole(UserRole model) diff --git a/web/ApiControllers/CircleController.cs b/web/ApiControllers/CircleController.cs index da7f7092..6b12bfa8 100644 --- a/web/ApiControllers/CircleController.cs +++ b/web/ApiControllers/CircleController.cs @@ -55,7 +55,7 @@ namespace Yavsc.ApiControllers /// username. [Authorize, AcceptVerbs ("POST")] - public void Add(long id, string username) + public void AddUserToCircle(long id, string username) { checkIsOwner (CircleManager.DefaultProvider.Get (id)); CircleManager.DefaultProvider.AddMember (id, username); diff --git a/web/App_Themes/style.css b/web/App_Themes/style.css index e583f8d8..f092246b 100644 --- a/web/App_Themes/style.css +++ b/web/App_Themes/style.css @@ -431,7 +431,6 @@ header h1, header a { padding:.2em;} .c2 { display:none; } .c2-alt { display:initial; } - fa::children() { display:none; } } diff --git a/web/ChangeLog b/web/ChangeLog index c4652a66..6b4d7166 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,16 @@ +2015-12-03 Paul Schneider + + * 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 * Yavsc.csproj: diff --git a/web/Controllers/FrontOfficeController.cs b/web/Controllers/FrontOfficeController.cs index 33c2a99a..aa459703 100644 --- a/web/Controllers/FrontOfficeController.cs +++ b/web/Controllers/FrontOfficeController.cs @@ -333,6 +333,16 @@ namespace Yavsc.Controllers // actually performed via the Web API :-° // else if (ModelState.IsValid) {} 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 Informations publiques votre profile)"); + var skills = SkillManager.FindSkill ("%",usp.MEACode); ViewData ["SiteSkills"] = skills; return View (usp); diff --git a/web/Views/Admin/UserList.aspx b/web/Views/Admin/UserList.aspx index a4a875e6..b2eb5c01 100644 --- a/web/Views/Admin/UserList.aspx +++ b/web/Views/Admin/UserList.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/AppAdmin.master" %> +<%@ Page Title="User_List" Language="C#" Inherits="System.Web.Mvc.ViewPage" MasterPageFile="~/Models/AppAdmin.master" %> <% Page.Title = LocalizedText.User_List; %>