fix: publisher

diff --git a/app/assets/javascripts/controllers/original_pictures.js.coffee b/app/assets/javascripts/controllers/original_pictures.js.coffee
index b579317..e63f4bf 100644 (file)
--- 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({\r
       item: @item,\r
     })\r
+    @listenTo(show, 'click:license', @click_license)\r
+    @listenTo(show, 'success', @publish)\r
+    @listenTo(show, 'click:close', @close_dialog)\r
     show.render()\r
     @trigger('ready', show)\r
     @trigger('done', @params)\r
@@ -53,6 +56,15 @@ class Pettanr.OriginalPicturesController extends Pettanr.AppController
     @trigger('ready', @form)\r
     @trigger('lock', @params, @form)\r
   \r
+  click_license: (dialog) ->\r
+    @trigger('lock', @params, dialog)\r
+  \r
+  publish: (dialog) ->\r
+    @trigger('unlock', @params, dialog)\r
+  \r
+  close_dialog: (dialog) ->\r
+    @trigger('unlock', @params, dialog)\r
+  \r
   create: () ->\r
     @listenTo(@form, 'success', @post_success)\r
     @listenTo(@form, 'fail', @post_fail)\r

diff --git a/app/assets/javascripts/editor/picture_publisher/dialog.js.coffee b/app/assets/javascripts/editor/picture_publisher/dialog.js.coffee
index 4b1e9be..c3f63dc 100644 (file)
--- 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) ->\r
     @trigger('success', resource_picture)\r
   \r
+  quit: () ->\r
+    @remove()\r
+  \r

diff --git a/app/assets/javascripts/views/original_pictures/show.js.coffee b/app/assets/javascripts/views/original_pictures/show.js.coffee
index bbb571b..e5293d3 100644 (file)
--- 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
   \r
   click_license: () ->\r
     @create_dialog()\r
+    @trigger('click:license', @dialog)\r
+    #retriever = new Pettanr.Cache.Retriever(@item.my_class(), @item.get('id'))\r
+    #@listenTo(retriever, 'retrieve', @create_dialog)\r
+    #retriever.edit()\r
   \r
   click_edit: () ->\r
     @trigger('http_get', @item.edit_url())\r
@@ -135,7 +139,7 @@ class Pettanr.Views.OriginalPicture.Show extends Backbone.View
       width: 500, \r
       height: 500,\r
       close: (ui, event) ->\r
-        _this.remove()\r
+        _this.close_dialog()\r
     })\r
     params = {\r
       controller: 'original_picture_license_groups', action: 'new', id: @item.get('id'), \r
@@ -148,6 +152,12 @@ class Pettanr.Views.OriginalPicture.Show extends Backbone.View
     false\r
   \r
   success: (resource_picture) ->\r
-    @dialog.remove()\r
+    #Pettanr.cache.fix(@item)\r
+    @trigger('success', @params, @dialog)\r
     @trigger('http_get', resource_picture.show_url())\r
+    Pettanr.cache.refresh(@item)\r
+  \r
+  close_dialog: () ->\r
+    #Pettanr.cache.release(@item)\r
+    @trigger('click:close', @dialog)\r
   \r