t#31085:raise err when input invalid encoding string

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

diff --git a/app/models/panel_picture.rb b/app/models/panel_picture.rb
index 5714e22..907e1a7 100644 (file)
--- a/app/models/panel_picture.rb
+++ b/app/models/panel_picture.rb
@@ -12,6 +12,15 @@ class PanelPicture < ActiveRecord::Base
   validates :z, :presence => true, :numericality => {:greater_than => 0}
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   
+  before_validation :valid_encode
+  
+  def valid_encode
+    ['link', 'caption'].each do |a|
+      next if attributes[a] == nil
+      raise Pettanr::BadRequest unless attributes[a].valid_encoding?
+    end
+  end
+  
   def visible? roles
     if MagicNumber['run_mode'] == 0
       return false unless guest_role_check(roles)