X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fassets%2Fjavascripts%2Fmodels%2Flicense.js.coffee;h=70cbff4b863a95ad87710f6bb1959c2e664b8617;hb=083cd052b6a10be6ddb3534307176f8c415952a8;hp=dd57148bc8497954c12efde25029e1c27b8a6312;hpb=29654349cc488148f053ec0bc973cd537cd6aaa8;p=pettanr%2Fpettanr.git

diff --git a/app/assets/javascripts/models/license.js.coffee b/app/assets/javascripts/models/license.js.coffee
index dd57148b..70cbff4b 100644
--- a/app/assets/javascripts/models/license.js.coffee
+++ b/app/assets/javascripts/models/license.js.coffee
@@ -12,21 +12,28 @@ class Pettanr.License extends Peta.SystemResource
   } 
   
   license_group: () ->
-    r = new Pettanr.LicenseGroup({id: @get('license_group_id')})
+    new Pettanr.Cache.Retriever(Pettanr.LicenseGroup, @get('license_group_id'))
   
   system_picture: () ->
-    new Pettanr.SystemPicture({id: @get('system_picture_id')})
+    new Pettanr.Cache.Retriever(Pettanr.SystemPicture, @get('system_picture_id'))
   
   symbol_option: () ->
-    i = @system_picture()
-    i.fetch({cache: true}).done =>
-      @trigger('ready:symbol', i.tmb_opt_img_tag())
+    retriever = @system_picture()
+    @listenTo(retriever, 'retrieve', @retrieve_symbol)
+    retriever.retrieve()
+  
+  retrieve_symbol: (item) -> 
+    @trigger('ready:symbol', item.tmb_opt_img_tag())
   
   caption_with_group: () ->
-    i = @license_group()
-    i.fetch({cache: true}).done =>
-      caption = i.escape('caption') + '/' + @escape('caption')
-      @trigger('ready:caption', caption)
+    retriever = @license_group()
+    @listenTo(retriever, 'retrieve', @retrieve_license_group)
+    retriever.retrieve()
+  
+  retrieve_license_group: (license_group) -> 
+    caption = license_group.escape('caption') + '/' + @escape('caption')
+    @trigger('ready:caption', caption)
+  
   is_own: () ->
     true