fix:server

[pettanr/pettanr.git] / app / models / license.rb

diff --git a/app/models/license.rb b/app/models/license.rb
index 7f41158..009f51e 100644 (file)
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -6,11 +6,13 @@ class License < Peta::SystemResource
   has_many :resource_pictures
   
   validates :license_group_id, :presence => true, :numericality => true, :existence => {:both => false}
-  validates :license_group_classname, :presence => true, :length => {:maximum => 50}
+  validates :license_group_module_name, :presence => true, :length => {:maximum => 50}
   validates :name, :presence => true, :length => {:maximum => 50}
   validates :caption, :presence => true, :length => {:maximum => 30}
   validates :url, :presence => true, :length => {:maximum => 200}, :uniqueness => {:scope => :name}, :url => {:message => I18n.t('errors.messages.url')} #{:allow_blank => true}
   validates :system_picture_id, :presence => true, :numericality => true, :existence => {:both => false}
+  validates :license_group_settings, :boost => {:boost_name => :license_group}
+  validates :credit_picture_settings, :boost => {:boost_name => :credit_picture}
   
   def overwrite 
   end
@@ -19,14 +21,10 @@ class License < Peta::SystemResource
     self.license_group.caption + '/' + self.caption
   end
   
-  def self.list_where
+  def self.index_list_where list
     ''
   end
   
-  def self.list_order
-    'licenses.name'
-  end
-  
   def self.show_opt
     {:include => {:license_group => {}}}
   end
@@ -40,6 +38,7 @@ class License < Peta::SystemResource
     attr['credit_picture_settings'] = attr['credit_picture_settings'].to_json
     attr['license_group_settings'] = attr['license_group_settings'].to_json
     l = License.modify_object name, attr
+    l.boosts 'post'
     if r == false
       l.errors.add :base, SystemPicture.model_name.human + I18n.t('errors.not_create')
     else