Merge branch 'design_team' into ldap

app/models/asset.rb

@@ -8,6 +8,16 @@ class Asset
   field :filename
   field :description
   
+  has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
+  
   validates_presence_of :filename, :data
+
+  belongs_to :asset_category
+  belongs_to :assetable, polymorphic: true
+  has_and_belongs_to_many :tags, :class_name => "AssetTag"
+
+  def sorted_tags
+    tags.order_by(I18n.locale, :asc)
+  end
   
 end

app/models/asset_category.rb

@@ -0,0 +1,16 @@
+class AssetCategory
+  include Mongoid::Document
+  include Mongoid::Timestamps
+
+  field :key
+  field :display
+  
+  has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
+  
+  has_many :assets
+  
+  def self.from_id(id)
+    AssetCategory.find(id) rescue nil
+  end
+  
+end

app/models/asset_tag.rb

@@ -0,0 +1,5 @@
+class AssetTag < Tag
+  
+  has_and_belongs_to_many :assets
+
+end