Client is version 0.5.40, fixed Panel.picture_id

[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 2e907aa..b560c3f 100644 (file)
--- a/app/models/speech_balloon_template.rb
+++ b/app/models/speech_balloon_template.rb
@@ -50,22 +50,10 @@ class SpeechBalloonTemplate < ActiveRecord::Base
     {}
   end
   
-  def self.templates_json_from attr
-    #templatesのballoonがフキダシ画像を持っているはずなので置換しておく
-    #templates => {hoge => {balloon => system_picture}}
-    (attr["templates"] || {}).each do |n, v|
-      next if n == 'speech_balloon'
-      res = replace_system_picture(v["balloon"] || {})
-      return nil if res == false #置換なしでnil 失敗でfalse
-    end
-    (attr["templates"] || {}).to_json.to_s
-  end
-  
   def self.store name, attr
     #settingsにはHashデータが丸っと文字列化されて入る
-    attr["settings"] = SpeechBalloonTemplate.templates_json_from(attr)
-    #templatesデータがあるとフキダシテンプレート生成で邪魔するので削除しておく
-    attr.delete "templates"
+    r = SpeechBalloonTemplate.replace_system_picture(attr["settings"] || {})
+    attr["settings"] = r ? r.to_json : nil
     r = SpeechBalloonTemplate.modify_object name, attr
     r.overwrite
     r.save