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
fix:new elm
[pettanr/pettanr.git]
/
app
/
assets
/
javascripts
/
manifest
/
model
/
association
/
has_one.js.coffee
diff --git
a/app/assets/javascripts/manifest/model/association/has_one.js.coffee
b/app/assets/javascripts/manifest/model/association/has_one.js.coffee
index
8c33c79
..
5cb1b6b
100644
(file)
--- a/
app/assets/javascripts/manifest/model/association/has_one.js.coffee
+++ b/
app/assets/javascripts/manifest/model/association/has_one.js.coffee
@@
-2,17
+2,22
@@
class Manifest.ModelModule.AssociationModule.HasOne extends ManifestBase.NameVal
\r
set_default: () ->
\r
super()
\r
\r
set_default: () ->
\r
super()
\r
- @values['model_name'] ||= @name
\r
- @values['foreign_key'] ||= @parent.model_name + '_id'
\r
+ @values['item_name'] ||= @name
\r
+ @values['foreign_key'] ||= @parent.item_name() + '_id'
\r
+ @values['list_action_name'] ||= 'by_' + @parent.item_name()
\r
\r
init: () ->
\r
super()
\r
\r
init: () ->
\r
super()
\r
- @
model_name = @values['model
_name']
\r
+ @
item_name = @values['item
_name']
\r
@foreign_key = @values['foreign_key']
\r
@foreign_key = @values['foreign_key']
\r
+ @list_action_name = @values['list_action_name']
\r
\r
is_through: () ->
\r
\r
is_through: () ->
\r
- !@through
\r
+ if @through
\r
+ true
\r
+ else
\r
+ false
\r
\r
model: () ->
\r
\r
model: () ->
\r
- Manifest.item_name_to_model @
model
_name
\r
+ Manifest.item_name_to_model @
item
_name
\r
\r
\r