OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 => {}}
},
:panel_pictures => {
:resource_picture => {:artist => {}, :license => {}}
},
- :balloons => {:spe
a
ches => {}},
+ :balloons => {:spe
e
ches => {}},
:author => {}
}}
end
:author => {}
}}
end
@@
-127,7
+127,7
@@
class Panel < ActiveRecord::Base
:panel_pictures => {
:resource_picture => {:artist => {}, :license => {}}
},
:panel_pictures => {
:resource_picture => {:artist => {}, :license => {}}
},
- :balloons => {:spe
a
ches => {}},
+ :balloons => {:spe
e
ches => {}},
:author => {}
}}
end
:author => {}
}}
end
@@
-144,7
+144,7
@@
class Panel < ActiveRecord::Base
:panel_pictures => {
:resource_picture => {:artist => {}, :license => {}}
},
:panel_pictures => {
:resource_picture => {:artist => {}, :license => {}}
},
- :balloons => {:spe
a
ches => {}},
+ :balloons => {:spe
e
ches => {}},
:author => {}
}
res.merge!(opt[:include]) if opt[:include]
:author => {}
}
res.merge!(opt[:include]) if opt[:include]
@@
-157,7
+157,7
@@
class Panel < ActiveRecord::Base
:panel_pictures => {
:resource_picture => {:artist => {}, :license => {}}
},
:panel_pictures => {
:resource_picture => {:artist => {}, :license => {}}
},
- :balloons => {:spe
a
ches => {}},
+ :balloons => {:spe
e
ches => {}},
:author => {}
}}
end
: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 => :resource_picture})
end
if elm.kind_of?(Balloon)
- res[elm.t] = elm.to_json({:include => :spe
a
ches})
+ res[elm.t] = elm.to_json({:include => :spe
e
ches})
end
end
res
end
end
res