diff options
| -rw-r--r-- | modules/user/controllers/admin_users.php | 31 | ||||
| -rw-r--r-- | modules/user/helpers/user_block.php | 5 | ||||
| -rw-r--r-- | modules/user/js/admin_users.js | 20 | ||||
| -rw-r--r-- | modules/user/views/admin_users.html.php | 45 | ||||
| -rw-r--r-- | themes/admin_default/js/ui.init.js | 2 |
5 files changed, 22 insertions, 81 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php index 8e2fec0a..f836f007 100644 --- a/modules/user/controllers/admin_users.php +++ b/modules/user/controllers/admin_users.php @@ -76,19 +76,24 @@ class Admin_Users_Controller extends Controller { kohana::show_404(); } - $form = user::get_edit_form($user, "admin/users/edit/$id"); - if (request::method() =="post" && $form->validate()) { - $user->name = $form->edit_user->uname->value; - $user->full_name = $form->edit_user->full_name->value; - $user->password = $form->edit_user->password->value; - $user->email = $form->edit_user->email->value; - $user->save(); - message::success(sprintf(_("Changed user %s"), $user->name)); - url::redirect("admin/users"); + $form = user::get_edit_form_admin($user, "admin/users/edit/$id"); + if (request::method() =="post" ) { + $form->edit_user->password->rules("-required"); + if($form->validate()) { + $user->name = $form->edit_user->uname->value; + $user->full_name = $form->edit_user->full_name->value; + $user->password = $form->edit_user->password->value; + $user->email = $form->edit_user->email->value; + $user->save(); + message::success(sprintf(_("Changed user %s"), $user->name)); + print json_encode(array("result" => "success")); + } else { + message::error(sprintf(_("Failed to change user %s"), $user->name)); + print json_encode(array("result" => "error", + "form" => $form->__toString())); + } + } else { + print $form; } - - $view = new Admin_View("admin.html"); - $view->content = $form; - print $view; } } diff --git a/modules/user/helpers/user_block.php b/modules/user/helpers/user_block.php index c3ea3bdf..5e406fef 100644 --- a/modules/user/helpers/user_block.php +++ b/modules/user/helpers/user_block.php @@ -27,11 +27,6 @@ class user_block_Core { } } - public static function admin_head($theme) { - $url = url::file("modules/user/js/admin_users.js"); - return "<script src=\"$url\" type=\"text/javascript\"></script>"; - } - public static function header_top($theme) { $view = new View("login.html"); $view->user = user::active(); diff --git a/modules/user/js/admin_users.js b/modules/user/js/admin_users.js deleted file mode 100644 index ab19f783..00000000 --- a/modules/user/js/admin_users.js +++ /dev/null @@ -1,20 +0,0 @@ -$("document").ready(function() { - ajaxify_admin_users_form(); -}); - -function ajaxify_admin_users_form() { - $("#gAddUser form").ajaxForm({ - dataType: "json", - success: function(data) { - if (data.form) { - $("#gAddUser form").replaceWith(data.form); - ajaxify_admin_users_form(); - } - if (data.result == "success") { - $(data.output).insertBefore("#gUsers li:last-child"); - $('.ui-accordion-container').accordion(); - $("#gUser li:last-child form").clearForm(); - } - } - }); -}; diff --git a/modules/user/views/admin_users.html.php b/modules/user/views/admin_users.html.php index 5a9e44e6..55d6d61c 100644 --- a/modules/user/views/admin_users.html.php +++ b/modules/user/views/admin_users.html.php @@ -3,55 +3,18 @@ <h2>User Administration</h2> <div class="gBlockContent"> <p>These are the users in your system</p> - <ul class="ui-accordion-container" id="gUsers"> + <ul> <? foreach ($users as $i => $user): ?> <li> <?= $user->name ?> <?= ($user->last_login == 0) ? "" : "(" . date("M j, Y", $user->last_login) . ")" ?> - <a href="#">edit</a> - <div> - <?= user::get_edit_form_admin($user); ?> - </div> + <a href="users/edit/<?= $user->id ?>" class="gDialogLink">edit</a> <? if (!(user::active()->id == $user->id || user::guest()->id == $user->id)): ?> - <a href="#">delete</a> - <div> - <?= user::get_delete_form_admin($user, "admin/users/delete/{$user->id}"); ?> - </div> + <a href="users/delete/<?= $user->id ?>" class="gDialogLink">delete</a> <? endif ?> </li> <? endforeach ?> - <li><a href="#">Add user</a> - <div id="gAddUser"> - <?= user::get_add_form_admin(); ?> - </div> - </li> + <li><a href="users/add/<?= $user->id ?>" class="gDialogLink">Add user</a></li> </ul> </div> - <h2>Group Administration</h2> - <div class="gBlockContent"> - <p>These are the groups in your system</p> - </div> - <ul class="ui-accordion-container"> - <? foreach ($groups as $i => $group): ?> - <li> - <?= $group->name ?> - <a href="#">edit</a> - <div> - <?= group::get_edit_form($group, "groups/{$group->id}?_method=put"); ?> - </div> - <? if (!$group->special): ?> - <a href="#">delete</a> - <div> - <?= group::get_delete_form($group, - "groups/{$group->id}?_method=delete"); ?> - </div> - <? endif ?> - </li> - <? endforeach ?> - <li><a href="#">Add group</a> - <div> - <?= group::get_add_form("groups/add?_method=post"); ?> - </div> - </li> - </ul> </div> diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js index 3e90b0b1..7018a45a 100644 --- a/themes/admin_default/js/ui.init.js +++ b/themes/admin_default/js/ui.init.js @@ -14,8 +14,6 @@ $(document).ready(function(){ speed: 'fast' }); - $('.ui-accordion-container').accordion(); - /** * Attach event listeners to open modal dialogs */ |