Mercurial > hg > soundsoftware-site
comparison app/models/.svn/text-base/role.rb.svn-base @ 120:cd2282d2aa55 cannam
Merge from the default branch. Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).
author | Chris Cannam |
---|---|
date | Thu, 13 Jan 2011 14:33:08 +0000 |
parents | 8661b858af72 |
children | cbce1fd3b1b7 |
comparison
equal
deleted
inserted
replaced
118:b859cc0c4fa1 | 120:cd2282d2aa55 |
---|---|
41 attr_protected :builtin | 41 attr_protected :builtin |
42 | 42 |
43 validates_presence_of :name | 43 validates_presence_of :name |
44 validates_uniqueness_of :name | 44 validates_uniqueness_of :name |
45 validates_length_of :name, :maximum => 30 | 45 validates_length_of :name, :maximum => 30 |
46 validates_format_of :name, :with => /^[\w\s\'\-]*$/i | |
47 | 46 |
48 def permissions | 47 def permissions |
49 read_attribute(:permissions) || [] | 48 read_attribute(:permissions) || [] |
50 end | 49 end |
51 | 50 |