diff options
| -rw-r--r-- | modules/user/controllers/admin_users.php | 6 | ||||
| -rw-r--r-- | modules/user/helpers/user.php | 4 | ||||
| -rw-r--r-- | modules/user/views/admin_users.html.php | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php index a251743c..8bf70f77 100644 --- a/modules/user/controllers/admin_users.php +++ b/modules/user/controllers/admin_users.php @@ -47,12 +47,12 @@ class Admin_Users_Controller extends Controller { kohana::show_404(); } - $form = user::get_delete_form($user); + $form = user::get_delete_form_admin($user); if ($form->validate()) { $name = $user->name; $user->delete(); - log::add(sprintf(_("Deleted user %s"), $name)); + log::add("user", sprintf(_("Deleted user %s"), $name)); message::add(sprintf(_("Deleted user %s"), $name)); url::redirect("admin/users"); } @@ -74,7 +74,7 @@ class Admin_Users_Controller extends Controller { $user->email = $form->edit_user->email->value; $user->save(); message::add(sprintf(_("Changed user %s"), $user->name)); - url::redirect("admin/users/edit/$id"); + url::redirect("admin/users"); } $view = new Admin_View("admin.html"); diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php index 83f9ca2b..308a3eca 100644 --- a/modules/user/helpers/user.php +++ b/modules/user/helpers/user.php @@ -27,7 +27,7 @@ class user_Core { public static function get_edit_form($user, $action = NULL) { $form = new Forge("users/$user->id?_method=put", "", "post", array("id" => "gUserForm")); $group = $form->group("edit_user")->label(_("Edit User")); - $group->input("name")->label(_("Name"))->id("gName")->value($user->name); + $group->input("uname")->label(_("Name"))->id("gName")->value($user->name); $group->input("full_name")->label(_("Full Name"))->id("gFullName")->value($user->full_name); $group->password("password")->label(_("Password"))->id("gPassword"); $group->input("email")->label(_("Email"))->id("gEmail")->value($user->email); @@ -39,7 +39,7 @@ class user_Core { public static function get_edit_form_admin($user, $action = NULL) { $form = new Forge("admin/users/edit/$user->id", "", "post", array("id" => "gUserForm")); $group = $form->group("edit_user")->label(_("Edit User")); - $group->input("name")->label(_("Name"))->id("gName")->value($user->name); + $group->input("uname")->label(_("Name"))->id("gName")->value($user->name); $group->input("full_name")->label(_("Full Name"))->id("gFullName")->value($user->full_name); $group->password("password")->label(_("Password"))->id("gPassword"); $group->input("email")->label(_("Email"))->id("gEmail")->value($user->email); diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index f9dc4c74..96a734ee 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -15,7 +15,7 @@ <? if (!(user::active()->id == $user->id || user::guest()->id == $user->id)): ?> <a href="#">delete</a> <div> - <?= user::get_delete_form_admin($user); ?> + <?= user::get_delete_form_admin($user, "admin/users/delete/{$user->id}"); ?> </div> <? endif ?> </li> |