From: yasushiito <yas@pen-chan.jp>
Date: Wed, 27 May 2015 05:20:53 +0000 (+0900)
Subject: fix: publisher
X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=commitdiff_plain;h=59535c9a030167616214c63d32ebbee59a9a59bb

fix: publisher
---

diff --git a/app/assets/javascripts/controllers/original_pictures.js.coffee b/app/assets/javascripts/controllers/original_pictures.js.coffee
index b5793173..e63f4bf4 100644
--- a/app/assets/javascripts/controllers/original_pictures.js.coffee
+++ b/app/assets/javascripts/controllers/original_pictures.js.coffee
@@ -25,6 +25,9 @@ class Pettanr.OriginalPicturesController extends Pettanr.AppController
     show = new Pettanr.Views.OriginalPicture.Show({
       item: @item,
     })
+    @listenTo(show, 'click:license', @click_license)
+    @listenTo(show, 'success', @publish)
+    @listenTo(show, 'click:close', @close_dialog)
     show.render()
     @trigger('ready', show)
     @trigger('done', @params)
@@ -53,6 +56,15 @@ class Pettanr.OriginalPicturesController extends Pettanr.AppController
     @trigger('ready', @form)
     @trigger('lock', @params, @form)
   
+  click_license: (dialog) ->
+    @trigger('lock', @params, dialog)
+  
+  publish: (dialog) ->
+    @trigger('unlock', @params, dialog)
+  
+  close_dialog: (dialog) ->
+    @trigger('unlock', @params, dialog)
+  
   create: () ->
     @listenTo(@form, 'success', @post_success)
     @listenTo(@form, 'fail', @post_fail)
diff --git a/app/assets/javascripts/editor/picture_publisher/dialog.js.coffee b/app/assets/javascripts/editor/picture_publisher/dialog.js.coffee
index 4b1e9be7..c3f63dc2 100644
--- a/app/assets/javascripts/editor/picture_publisher/dialog.js.coffee
+++ b/app/assets/javascripts/editor/picture_publisher/dialog.js.coffee
@@ -54,3 +54,6 @@ class Editor.PicturePublisher.Dialog extends Editor.Dialog
   success: (resource_picture) ->
     @trigger('success', resource_picture)
   
+  quit: () ->
+    @remove()
+  
diff --git a/app/assets/javascripts/views/original_pictures/show.js.coffee b/app/assets/javascripts/views/original_pictures/show.js.coffee
index bbb571b8..e5293d37 100644
--- a/app/assets/javascripts/views/original_pictures/show.js.coffee
+++ b/app/assets/javascripts/views/original_pictures/show.js.coffee
@@ -117,6 +117,10 @@ class Pettanr.Views.OriginalPicture.Show extends Backbone.View
   
   click_license: () ->
     @create_dialog()
+    @trigger('click:license', @dialog)
+    #retriever = new Pettanr.Cache.Retriever(@item.my_class(), @item.get('id'))
+    #@listenTo(retriever, 'retrieve', @create_dialog)
+    #retriever.edit()
   
   click_edit: () ->
     @trigger('http_get', @item.edit_url())
@@ -135,7 +139,7 @@ class Pettanr.Views.OriginalPicture.Show extends Backbone.View
       width: 500, 
       height: 500,
       close: (ui, event) ->
-        _this.remove()
+        _this.close_dialog()
     })
     params = {
       controller: 'original_picture_license_groups', action: 'new', id: @item.get('id'), 
@@ -148,6 +152,12 @@ class Pettanr.Views.OriginalPicture.Show extends Backbone.View
     false
   
   success: (resource_picture) ->
-    @dialog.remove()
+    #Pettanr.cache.fix(@item)
+    @trigger('success', @params, @dialog)
     @trigger('http_get', resource_picture.show_url())
+    Pettanr.cache.refresh(@item)
+  
+  close_dialog: () ->
+    #Pettanr.cache.release(@item)
+    @trigger('click:close', @dialog)