diff options
| -rw-r--r-- | modules/user/controllers/admin_users.php | 8 | ||||
| -rw-r--r-- | modules/user/helpers/user.php | 8 | ||||
| -rw-r--r-- | modules/user/views/admin_users_delete.html.php | 5 |
3 files changed, 11 insertions, 10 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php index f836f007..71978e3b 100644 --- a/modules/user/controllers/admin_users.php +++ b/modules/user/controllers/admin_users.php @@ -57,17 +57,17 @@ class Admin_Users_Controller extends Controller { kohana::show_404(); } - $form = user::get_delete_form_admin($user); - if ($form->validate()) { + if (request::method() == "post" ) { $name = $user->name; $user->delete(); log::success("user", sprintf(_("Deleted user %s"), $name)); message::success(sprintf(_("Deleted user %s"), $name)); - url::redirect("admin/users"); + print json_encode(array("result" => "success")); + } else { + print user::get_delete_form_admin($user, "admin/users/delete/$id"); } - print $form; } public function edit($id) { diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php index 308a3eca..584bc72f 100644 --- a/modules/user/helpers/user.php +++ b/modules/user/helpers/user.php @@ -43,7 +43,6 @@ class user_Core { $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); - $group->submit(_("Modify")); $form->add_rules_from($user); return $form; } @@ -62,11 +61,8 @@ class user_Core { } public static function get_delete_form_admin($user, $action = NULL) { - $form = new Forge($action); - $group = $form->group("delete_user")->label(_("Delete User")); - $group->label(sprintf(_("Are you sure you want to delete %s?"), $user->name)); - $group->submit(_("Delete")); - return $form; + $form = new Forge($action, sprintf(_("Are you sure you want to delete %s"), $user->name)); + return $form->render("admin_users_delete.html"); } /** diff --git a/modules/user/views/admin_users_delete.html.php b/modules/user/views/admin_users_delete.html.php new file mode 100644 index 00000000..4ee9e3d4 --- /dev/null +++ b/modules/user/views/admin_users_delete.html.php @@ -0,0 +1,5 @@ +<? defined("SYSPATH") or die("No direct script access."); ?>
+<?= $open ?>
+<h3><?= $title ?></h3>
+<?= $inputs['csrf']->render() ?>
+<?= $close ?>
|