fix filer caption

diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/method.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/method.js.coffee
index 612544d..e1f01a7 100644 (file)
--- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/method.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/method.js.coffee
@@ -6,7 +6,10 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemCo
       @item[@method_name()]()\r
   \r
   render: () ->\r
-    this.$el.html(@item.caption_text)\r
+    if Pettanr.is_blank(@item.caption_text)\r
+      this.$el.html('empty')\r
+    else\r
+      this.$el.html(@item.caption_text)\r
     this\r
   \r
   method_name: () ->\r

diff --git a/app/assets/javascripts/models/original_picture.js.coffee b/app/assets/javascripts/models/original_picture.js.coffee
index 6eafde9..77015a3 100644 (file)
--- a/app/assets/javascripts/models/original_picture.js.coffee
+++ b/app/assets/javascripts/models/original_picture.js.coffee
@@ -38,11 +38,21 @@ class Pettanr.OriginalPicture extends Peta.Content
       picture: this\r
     })\r
   \r
-  symbol_option: (cb) ->\r
+  symbol_option: () ->\r
     @fetch({cache: true}).done =>\r
       @symbol_picture = @tmb_opt_img_tag()\r
       @trigger('ready:symbol')\r
   \r
+  filer_caption: () ->\r
+    history = @history()\r
+    history.fetch({cache: true}).done =>\r
+      @caption_text = if _.isEmpty(history.models)\r
+        'unpublished'\r
+      else\r
+        head = _.first(history.models)\r
+        Pettanr.to_s(head.get('revision'))\r
+      @trigger('ready:caption')\r
+  \r
   revision: () ->\r
     new Pettanr.OriginalPicture.Head({original_picture: this})\r
   \r
@@ -82,8 +92,9 @@ class Pettanr.OriginalPicture.History extends Backbone.Collection
   url: '/original_pictures/'\r
   \r
   initialize: (options) ->\r
+    @original_picture = options.original_picture\r
     @model = Pettanr.Picture\r
-    @url = @url + options.id + '/history'\r
+    @url = @url + @original_picture.get('id') + '/history'\r
   \r
 class Pettanr.OriginalPicture.Head extends Backbone.View\r
   tagName: 'span'\r

diff --git a/app/assets/javascripts/models/speech_balloon.js.coffee b/app/assets/javascripts/models/speech_balloon.js.coffee
index a330668..a29eabd 100644 (file)
--- a/app/assets/javascripts/models/speech_balloon.js.coffee
+++ b/app/assets/javascripts/models/speech_balloon.js.coffee
@@ -30,6 +30,11 @@ class Pettanr.SpeechBalloon extends Peta.Element
         @symbol_picture = sp.tmb_opt_img_tag()\r
         @trigger('ready:symbol')\r
   \r
+  filer_caption: () ->\r
+    @fetch({cache: true}).done =>\r
+      @caption_text = @get('caption')\r
+      @trigger('ready:caption')\r
+  \r
   plain_scenario: () ->\r
     @get('caption')\r
   \r

diff --git a/app/assets/javascripts/work/filers.js.coffee.erb b/app/assets/javascripts/work/filers.js.coffee.erb
index 1556523..68b738e 100644 (file)
--- a/app/assets/javascripts/work/filers.js.coffee.erb
+++ b/app/assets/javascripts/work/filers.js.coffee.erb
@@ -241,7 +241,7 @@
         face: {\r
           type: 'method',\r
           args: {\r
-            method_name: 'plain_scenario',\r
+            method_name: 'filer_caption',\r
           },\r
         },\r
         link: {\r
@@ -361,7 +361,7 @@
         face: {\r
           type: 'method',\r
           args: {\r
-            method_name: 'revision',\r
+            method_name: 'filer_caption',\r
           },\r
         },\r
         link: {\r

diff --git a/app/models/folder.rb b/app/models/folder.rb
index 7b13631..e004a57 100644 (file)
--- a/app/models/folder.rb
+++ b/app/models/folder.rb
@@ -18,6 +18,10 @@ class Folder < Peta::SystemResource
     name.gsub(/\/$/, '').split('/').last
   end
   
+  def filer_caption
+    self.caption
+  end
+  
   def remote_name
     '/' + self.controller_name.to_s + '/' + self.action_name.to_s
   end

diff --git a/app/models/original_picture.rb b/app/models/original_picture.rb
index 759da1d..20ec95b 100644 (file)
--- a/app/models/original_picture.rb
+++ b/app/models/original_picture.rb
@@ -50,6 +50,10 @@ class OriginalPicture < Peta::Content
     self.tmb_opt_img_tag
   end
   
+  def filer_caption
+    self.revision
+  end
+  
   def revision
     head = self.history.first
     head ? head.revision : 'unpublished'

diff --git a/app/models/speech_balloon.rb b/app/models/speech_balloon.rb
index 00f38ad..0289e59 100644 (file)
--- a/app/models/speech_balloon.rb
+++ b/app/models/speech_balloon.rb
@@ -42,6 +42,10 @@ class SpeechBalloon < Peta::Element
     self.speech_balloon_template.symbol_option
   end
   
+  def filer_caption
+    self.plain_scenario
+  end
+  
   def self.public_list_where list
     'panels.publish > 0'
   end

diff --git a/public/local_manifest.json b/public/local_manifest.json
index c466554..c84f4a7 100644 (file)
--- a/public/local_manifest.json
+++ b/public/local_manifest.json
@@ -69,7 +69,14 @@
           }\r
         },\r
         "play": {\r
-          "type": "public"\r
+          "type": "play",\r
+          "args": {\r
+            "filter_item_name": "comic",\r
+            "wheres": [\r
+              "index",\r
+              "play"\r
+            ]\r
+          }\r
         }\r
       }\r
     },\r
@@ -115,7 +122,14 @@
           "type": "filter"\r
         },\r
         "play": {\r
-          "type": "public"\r
+          "type": "play",\r
+          "args": {\r
+            "filter_item_name": "story",\r
+            "wheres": [\r
+              "index",\r
+              "play"\r
+            ]\r
+          }\r
         }\r
       }\r
     },\r
@@ -1668,7 +1682,7 @@
           "face": {\r
             "type": "method",\r
             "args": {\r
-              "method_name": "plain_scenario"\r
+              "method_name": "filer_caption"\r
             }\r
           },\r
           "link": {\r
@@ -1783,7 +1797,7 @@
           "face": {\r
             "type": "method",\r
             "args": {\r
-              "method_name": "revision"\r
+              "method_name": "filer_caption"\r
             }\r
           },\r
           "link": {\r