t#31702:add icon

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

diff --git a/app/models/speech_balloon_template.rb b/app/models/speech_balloon_template.rb
index a1f14d9..4aa68e5 100644 (file)
--- a/app/models/speech_balloon_template.rb
+++ b/app/models/speech_balloon_template.rb
@@ -1,11 +1,13 @@
 #フキダシテンプレート
 class SpeechBalloonTemplate < ActiveRecord::Base
   has_many :speech_balloons
+  belongs_to :system_picture
   
   validates :name, :presence => true, :uniqueness => true, :length => {:maximum => 50}
   validates :classname, :presence => true, :length => {:maximum => 50}
   validates :caption, :presence => true, :length => {:maximum => 30}
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
+  validates :system_picture_id, :presence => true, :numericality => true, :existence => {:both => false}
   validates :settings, :presence => true
   
   before_validation :valid_encode
@@ -61,8 +63,8 @@ class SpeechBalloonTemplate < ActiveRecord::Base
   
   def self.store name, attr
     #settingsにはHashデータが丸っと文字列化されて入る
-    r = SpeechBalloonTemplate.replace_system_picture(attr["settings"] || {})
-    attr["settings"] = r ? r.to_json : nil
+    r = SpeechBalloonTemplate.replace_system_picture(attr || {})
+    attr["settings"] = r["settings"] ? r["settings"].to_json : nil
     r = SpeechBalloonTemplate.modify_object name, attr
     r.overwrite
     r.save
@@ -113,4 +115,15 @@ class SpeechBalloonTemplate < ActiveRecord::Base
     SpeechBalloonTemplate.import_file(filename) {|name, attr| SpeechBalloonTemplate.store(name, attr)}
   end
   
+  def self.disp_import_error r
+    if r == false
+      puts "json file error. file does not exist or broken"
+    else
+      unless r.empty?
+        r.each do |sbt|
+          put sbt.errors.full_messages
+        end
+      end
+    end
+  end
 end