From 9c24b5d94dec36e5c3c1f6450dea77f6c2c623a9 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Wed, 13 May 2009 03:56:50 +0000 Subject: Variety of changes to the way we do user editing: 1) Allow admins to edit the admin bit of other admins 2) Don't allow admins to delete themselves (partial fix for ticket #213) 3) Inline user::update(). Don't do form processing in helper methods! 4) Inline user::_get_edit_form() so that we can treat edit forms differently. Trying to hard to make common functions makes for weird edge cases. --- modules/user/models/user.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/user/models') diff --git a/modules/user/models/user.php b/modules/user/models/user.php index 7299a36b..432d86fb 100644 --- a/modules/user/models/user.php +++ b/modules/user/models/user.php @@ -21,10 +21,10 @@ class User_Model extends ORM { protected $has_and_belongs_to_many = array("groups"); var $rules = array( - "name" => "required|length[1,32]", + "name" => "length[1,32]", "full_name" => "length[0,255]", "email" => "valid_email|length[1,255]", - "password" => "required|length[1,40]", + "password" => "length[1,40]", "locale" => "length[2,10]"); public function __set($column, $value) { -- cgit v1.2.3