notazof/yavsc
1
1
Fork 0
Code Issues 1 Pull requests Projects 2 Releases 10 Packages Wiki Activity Actions

* ResultPages.cs:

Browse source 
* NpgsqlBlogProvider.cs: PageIndex is now one based

* AccountController.cs: Fixes a typo in the registration mail

* AdminController.cs: Should fix a 500 at Registration validation

* BasketController.cs: WIP

* BlogsController.cs: page indexes are now one based

* FrontOfficeController.cs: cleanning

* GoogleController.cs: code formatting

* Global.asax.cs: Default route data to "controller" "action" "id"

* BBCodeHelper.cs: Allows not closed "url" BBcodes 

* InitDb.aspx: StatisPage.master was renamed

* packages.config: Google references require System.Web 4.0.0.0 ...
  removed
This commit is contained in:
Paul Schneider 2015-02-08 20:59:08 +01:00
commit f54336852b
12 changed files with 29 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

25
web/Controllers/AdminController.cs
View file

@ -260,13 +260,23 @@ namespace Yavsc.Controllers
[Authorize()]
public ActionResult Admin (NewAdminModel model)
{
// ASSERT (Roles.RoleExists (adminRoleName))
string [] admins = Roles.GetUsersInRole (adminRoleName);
string currentUser = Membership.GetUser ().UserName;
List<SelectListItem> users = new List<SelectListItem> ();
foreach (MembershipUser u in Membership.GetAllUsers ()) {
var i = new SelectListItem ();
i.Text = string.Format ("{0} <{1}>", u.UserName, u.Email);
i.Value = u.UserName;
users.Add (i);
}
ViewData ["admins"] = admins;
ViewData ["useritems"] = users;
if (ModelState.IsValid) {
Roles.AddUserToRole (model.UserName, adminRoleName);
ViewData ["Message"] = model.UserName + " "+LocalizedText.was_added_to_the_role+" '" + adminRoleName + "'";
} else {
// ASSERT (Roles.RoleExists (adminRoleName))
string [] admins = Roles.GetUsersInRole (adminRoleName);
if (admins.Length > 0) {
if (! admins.Contains (Membership.GetUser ().UserName)) {
ModelState.Remove("UserName");
@ -274,22 +284,13 @@ namespace Yavsc.Controllers
return View ("Index");
}
} else {
// No admin, gives the Admin Role to the current user
Roles.AddUserToRole (currentUser, adminRoleName);
admins = new string[] { currentUser };
ViewData ["Message"] += string.Format (
LocalizedText.was_added_to_the_empty_role,
currentUser, adminRoleName);
}
List<SelectListItem> users = new List<SelectListItem> ();
foreach (MembershipUser u in Membership.GetAllUsers ()) {
var i = new SelectListItem ();
i.Text = string.Format ("{0} <{1}>", u.UserName, u.Email);
i.Value = u.UserName;
users.Add (i);
}
ViewData ["useritems"] = users;
ViewData ["admins"] = admins;
}
return View (model);
}