kubaninc / has_magic_fields

Download as
Browse Code ยป

Commit ef7204aab77ceb490bcf46882c14b46de56e74aa

Authored by freedomprogramer
1 parent 1304f525
Exists in master

pretty_name_cn must be presence

Showing 1 changed file with 5 additions and 5 deletions   Show diff stats
lib/app/models/magic_field.rb
  Diff comments   View file @ef7204a
... ... @@ -2,8 +2,8 @@ class MagicField < ActiveRecord::Base
2 2 has_many :magic_field_relationships, :dependent => :destroy
3 3 has_many :owners, :through => :magic_field_relationships, :as => :owner
4 4 has_many :magic_attributes, :dependent => :destroy
5   -
6   - validates_presence_of :name, :datatype
  5 +
  6 + validates_presence_of :name, :datatype, :pretty_name_cn
7 7 validates_format_of :name, :with => /\A[a-z][a-z0-9_]+\z/
8 8  
9 9 before_save :set_pretty_name
... ... @@ -22,7 +22,7 @@ class MagicField < ActiveRecord::Base
22 22 when :string
23 23 value
24 24 when :check_box_boolean
25   - (value.to_int == 1) ? true : false
  25 + (value.to_int == 1) ? true : false
26 26 when :date
27 27 Date.parse(value)
28 28 when :datetime
... ... @@ -36,10 +36,10 @@ class MagicField < ActiveRecord::Base
36 36 value
37 37 end
38 38 end
39   -
  39 +
40 40 # Display a nicer (possibly user-defined) name for the column or use a fancified default.
41 41 def set_pretty_name
42 42 self.pretty_name = name.humanize if pretty_name.blank?
43 43 end
44   -
  44 +
45 45 end
... ...