diff options
Diffstat (limited to 'modules/user/controllers/admin_users.php')
-rw-r--r-- | modules/user/controllers/admin_users.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php index 70348a69..64f19ecd 100644 --- a/modules/user/controllers/admin_users.php +++ b/modules/user/controllers/admin_users.php @@ -21,7 +21,6 @@ class Admin_Users_Controller extends Admin_Controller { public function index() { $view = new Admin_View("admin.html"); $view->content = new View("admin_users.html"); - $view->content->writable = user::is_writable(); $view->content->users = user::get_user_list(array("orderby" => array("name" => "ASC"))); $view->content->groups = group::get_group_list(array("orderby" => array("name" => "ASC"))); print $view; @@ -304,7 +303,7 @@ class Admin_Users_Controller extends Admin_Controller { $group->input("email")->label(t("Email"))->id("g-email")->value($user->email); $group->input("url")->label(t("URL"))->id("g-url")->value($user->url); $group->checkbox("admin")->label(t("Admin"))->id("g-admin")->checked($user->admin); - $form->add_rules_from($user); + $form->add_rules_from(user::get_edit_rules()); $form->edit_user->password->rules("-required"); module::event("user_edit_form_admin", $user, $form); @@ -327,7 +326,7 @@ class Admin_Users_Controller extends Admin_Controller { self::_add_locale_dropdown($group); $group->checkbox("admin")->label(t("Admin"))->id("g-admin"); $user = ORM::factory("user"); - $form->add_rules_from($user); + $form->add_rules_from(user::get_edit_rules()); module::event("user_add_form_admin", $user, $form); $group->submit("")->value(t("Add User")); @@ -367,7 +366,7 @@ class Admin_Users_Controller extends Admin_Controller { $form_group->inputs["name"]->error_messages( "in_use", t("There is already a group with that name")); $form_group->submit("")->value(t("Save")); - $form->add_rules_from($group); + $form->add_rules_from(group::get_edit_rules()); return $form; } @@ -380,7 +379,7 @@ class Admin_Users_Controller extends Admin_Controller { "in_use", t("There is already a group with that name")); $form_group->submit("")->value(t("Add Group")); $group = ORM::factory("group"); - $form->add_rules_from($group); + $form->add_rules_from(group::get_edit_rules()); return $form; } |