Merge branch 'v03_test' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v03_test

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

diff --git a/app/models/panel.rb b/app/models/panel.rb
index 2d7de5b..45090ea 100644 (file)
--- a/app/models/panel.rb
+++ b/app/models/panel.rb
@@ -116,7 +116,7 @@ class Panel < ActiveRecord::Base
       :panel_pictures => {
         :resource_picture => {:artist => {}, :license => {}}
       }, 
-      :balloons => {:speaches => {}},
+      :balloons => {:speeches => {}},
       :author => {}
     }}
   end
@@ -127,7 +127,7 @@ class Panel < ActiveRecord::Base
       :panel_pictures => {
         :resource_picture => {:artist => {}, :license => {}}
       }, 
-      :balloons => {:speaches => {}},
+      :balloons => {:speeches => {}},
       :author => {}
     }}
   end
@@ -144,7 +144,7 @@ class Panel < ActiveRecord::Base
       :panel_pictures => {
         :resource_picture => {:artist => {}, :license => {}}
       }, 
-      :balloons => {:speaches => {}},
+      :balloons => {:speeches => {}},
       :author => {}
     }
     res.merge!(opt[:include]) if opt[:include]
@@ -157,7 +157,7 @@ class Panel < ActiveRecord::Base
       :panel_pictures => {
         :resource_picture => {:artist => {}, :license => {}}
       }, 
-      :balloons => {:speaches => {}},
+      :balloons => {:speeches => {}},
       :author => {}
     }}
   end
@@ -197,7 +197,7 @@ class Panel < ActiveRecord::Base
         res[elm.t] = elm.to_json({:include => :resource_picture})
       end
       if elm.kind_of?(Balloon)
-        res[elm.t] = elm.to_json({:include => :speaches})
+        res[elm.t] = elm.to_json({:include => :speeches})
       end
     end
     res