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
/
balloon_template.rb
diff --git
a/app/models/balloon_template.rb
b/app/models/balloon_template.rb
index
7f32278
..
c050ed9
100644
(file)
--- a/
app/models/balloon_template.rb
+++ b/
app/models/balloon_template.rb
@@
-1,6
+1,6
@@
class BalloonTemplate < ActiveRecord::Base
class BalloonTemplate < ActiveRecord::Base
- belongs_to :spe
a
ch_balloon
- has_many :spe
a
ch_templates, :dependent => :destroy
+ belongs_to :spe
e
ch_balloon
+ has_many :spe
e
ch_templates, :dependent => :destroy
belongs_to :system_picture
belongs_to :system_picture
- accepts_nested_attributes_for :spe
a
ch_templates
+ accepts_nested_attributes_for :spe
e
ch_templates
end
end