summaryrefslogtreecommitdiff
path: root/modules/user/models
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-05-13 03:56:50 +0000
committerBharat Mediratta <bharat@menalto.com>2009-05-13 03:56:50 +0000
commit9c24b5d94dec36e5c3c1f6450dea77f6c2c623a9 (patch)
tree0706453686bbbd68fd5d2df132d862bcfe18c9a2 /modules/user/models
parentb9aeec634d8aca1848233a88ab18a732e3df5914 (diff)
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.
Diffstat (limited to 'modules/user/models')
-rw-r--r--modules/user/models/user.php4
1 files changed, 2 insertions, 2 deletions
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) {