temp

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

diff --git a/app/models/license_group.rb b/app/models/license_group.rb
index eda792f..cc09080 100644 (file)
--- a/app/models/license_group.rb
+++ b/app/models/license_group.rb
@@ -7,6 +7,15 @@ class LicenseGroup < ActiveRecord::Base
   validates :caption, :presence => true, :length => {:maximum => 30}
   validates :url, :presence => true, :length => {:maximum => 200}, :url => {:message => I18n.t('errors.messages.url')}
   
+  before_validation :valid_encode
+  
+  def valid_encode
+    ['name', 'classname', 'caption', 'url'].each do |a|
+      next if attributes[a] == nil
+      raise Pettanr::BadRequest unless attributes[a].valid_encoding?
+    end
+  end
+  
   def supply_default
   end
   
@@ -28,7 +37,7 @@ class LicenseGroup < ActiveRecord::Base
     {:include => {:licenses => {}}}
   end
   
-  def self.show rid
+  def self.show rid, roles = nil
     opt = {}
     opt.merge!(self.show_opt)
     res = LicenseGroup.find(rid, opt)