t#29400:update:itr2

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

diff --git a/app/models/license.rb b/app/models/license.rb
index 704e348..9a0fcb6 100644 (file)
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -9,30 +9,15 @@ class License < ActiveRecord::Base
   validates :url, :presence => true, :length => {:maximum => 200}, :uniqueness => true, :url => true #{:allow_blank => true}
   validates :system_picture_id, :presence => true, :numericality => true, :existence => true
   
-  def self.store name, attr
-    r = License.replace_system_picture attr
-    l = License.modify_object name, attr
-    if r == false
-      l.errors.add :base, 'system picture can not create'
-    else
-      l.save
-    end
-    l
+  def supply_default
   end
   
-  def self.stores attrs, lg_id
-    res = 0
-    return 0 unless attrs.is_a?(Hash)
-    attrs.each do |name, attr|
-      attr["license_group_id"] = lg_id
-      l = License.store name, attr
-      res += 1 unless l.valid?
-    end
-    res
+  def overwrite
   end
   
-  def self.list opt = {}
-    opt.merge!(self.list_opt) unless opt[:include]
+  def self.list
+    opt = {}
+    opt.merge!(License.list_opt)
     opt.merge!({:order => 'name'})
     License.find(:all, opt)
   end
@@ -45,20 +30,42 @@ class License < ActiveRecord::Base
     {:include => {:license_group => {}}}
   end
   
-  def self.show rid, opt = {}
-    r = License.find(rid, :include => self.show_include_opt(opt))
-#    raise ActiveRecord::Forbidden unless c.visible?(au)
-    r
+  def self.show rid
+    opt = {}
+    opt.merge!(License.show_opt)
+    res = License.find(rid, opt)
+#    raise ActiveRecord::Forbidden unless res.visible?(au)
+    res
   end
   
-  def self.show_include_opt opt = {}
-    res = [:license_group]
-    res.push(opt[:include]) if opt[:include]
-    res
+  def self.show_opt
+    {:include => {:license_group => {}}}
   end
   
-  def self.show_json_include_opt
+  def self.show_json_opt
     {:include => {:license_group => {}}}
   end
   
+  def self.store name, attr
+    r = License.replace_system_picture attr
+    l = License.modify_object name, attr
+    if r == false
+      l.errors.add :base, 'system picture can not create'
+    else
+      l.save
+    end
+    l
+  end
+  
+  def self.stores attrs, lg_id
+    res = 0
+    return 0 unless attrs.is_a?(Hash)
+    attrs.each do |name, attr|
+      attr["license_group_id"] = lg_id
+      l = License.store name, attr
+      res += 1 unless l.valid?
+    end
+    res
+  end
+  
 end