modified: app/models/permission.rb

modified:   app/models/tag.rb
modified:   db/migrate/20121031055154_create_tags.rb
	-- fixed class label as attribute bug (my bad)

app/models/permission.rb

@@ -15,7 +15,8 @@ class Permission < ActiveRecord::Base
   # belongs_to :user
 
   # enumerations
-  enumerize :level, :in => [:owner, :write, :read, :none], :default => :none, predicates: true
+  enumerize :level, :in => [:owner, :writer, :reader, :none], :default => :none, predicates: true
+
 
   # validation
   validates :level, :presence => true

app/models/tag.rb

@@ -6,7 +6,7 @@ class Tag < ActiveRecord::Base
   has_many :audio_events, :through => :audio_event_tags
 
   # attr
-  attr_accessible :class, :is_taxanomic, :text, :type_of_tag
+  attr_accessible :is_taxanomic, :text, :type_of_tag
 
   # userstamp
   stampable
@@ -15,21 +15,20 @@ class Tag < ActiveRecord::Base
   validates_as_paranoid
 
   # enums
-  enumerize :class, :in => [:looks_like, :sounds_like], predicates: true
-  enumerize :type_of_tag, :in => [:common_name, :species_name], predicates: true
+  enumerize :type_of_tag, :in => [:common_name, :species_name, :looks_like, :sounds_like], predicates: true
 
   # validation
   validates :is_taxanomic, :presence => true
   validates :text, :uniqueness => { :case_sensitive => false }
-  validate :class_mutually_exclusive_with_tag_type
+  #validate :class_mutually_exclusive_with_tag_type
 
   # custom validation
-  def class_mutually_exclusive_with_tag_type
-    return if self.class.nil? || self.type.nil?
-
-    errors.add(:class, "class and type_of_tag cannot both be set")
-    errors.add(:type_of_tag, "class and type_of_tag cannot both be set")
-  end
+  #def class_mutually_exclusive_with_tag_type
+  #  return if self.class.nil? || self.type.nil?
+  #
+  #  errors.add(:class, "class and type_of_tag cannot both be set")
+  #  errors.add(:type_of_tag, "class and type_of_tag cannot both be set")
+  #end
 
   private
   # default values