From: yasushiito <yas@pen-chan.jp>
Date: Fri, 12 Dec 2014 02:47:41 +0000 (+0900)
Subject: fix filer caption
X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=commitdiff_plain;h=0bc0be6f26cb148983898dd323ca3e097d7509e2

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 612544d9..e1f01a7c 100644
--- 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()]()
   
   render: () ->
-    this.$el.html(@item.caption_text)
+    if Pettanr.is_blank(@item.caption_text)
+      this.$el.html('empty')
+    else
+      this.$el.html(@item.caption_text)
     this
   
   method_name: () ->
diff --git a/app/assets/javascripts/models/original_picture.js.coffee b/app/assets/javascripts/models/original_picture.js.coffee
index 6eafde9b..77015a38 100644
--- 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
     })
   
-  symbol_option: (cb) ->
+  symbol_option: () ->
     @fetch({cache: true}).done =>
       @symbol_picture = @tmb_opt_img_tag()
       @trigger('ready:symbol')
   
+  filer_caption: () ->
+    history = @history()
+    history.fetch({cache: true}).done =>
+      @caption_text = if _.isEmpty(history.models)
+        'unpublished'
+      else
+        head = _.first(history.models)
+        Pettanr.to_s(head.get('revision'))
+      @trigger('ready:caption')
+  
   revision: () ->
     new Pettanr.OriginalPicture.Head({original_picture: this})
   
@@ -82,8 +92,9 @@ class Pettanr.OriginalPicture.History extends Backbone.Collection
   url: '/original_pictures/'
   
   initialize: (options) ->
+    @original_picture = options.original_picture
     @model = Pettanr.Picture
-    @url = @url + options.id + '/history'
+    @url = @url + @original_picture.get('id') + '/history'
   
 class Pettanr.OriginalPicture.Head extends Backbone.View
   tagName: 'span'
diff --git a/app/assets/javascripts/models/speech_balloon.js.coffee b/app/assets/javascripts/models/speech_balloon.js.coffee
index a3306686..a29eabd6 100644
--- 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()
         @trigger('ready:symbol')
   
+  filer_caption: () ->
+    @fetch({cache: true}).done =>
+      @caption_text = @get('caption')
+      @trigger('ready:caption')
+  
   plain_scenario: () ->
     @get('caption')
   
diff --git a/app/assets/javascripts/work/filers.js.coffee.erb b/app/assets/javascripts/work/filers.js.coffee.erb
index 15565230..68b738e8 100644
--- a/app/assets/javascripts/work/filers.js.coffee.erb
+++ b/app/assets/javascripts/work/filers.js.coffee.erb
@@ -241,7 +241,7 @@
         face: {
           type: 'method',
           args: {
-            method_name: 'plain_scenario',
+            method_name: 'filer_caption',
           },
         },
         link: {
@@ -361,7 +361,7 @@
         face: {
           type: 'method',
           args: {
-            method_name: 'revision',
+            method_name: 'filer_caption',
           },
         },
         link: {
diff --git a/app/models/folder.rb b/app/models/folder.rb
index 7b136310..e004a57c 100644
--- 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 759da1df..20ec95b0 100644
--- 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 00f38ad5..0289e591 100644
--- 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 c466554f..c84f4a78 100644
--- a/public/local_manifest.json
+++ b/public/local_manifest.json
@@ -69,7 +69,14 @@
           }
         },
         "play": {
-          "type": "public"
+          "type": "play",
+          "args": {
+            "filter_item_name": "comic",
+            "wheres": [
+              "index",
+              "play"
+            ]
+          }
         }
       }
     },
@@ -115,7 +122,14 @@
           "type": "filter"
         },
         "play": {
-          "type": "public"
+          "type": "play",
+          "args": {
+            "filter_item_name": "story",
+            "wheres": [
+              "index",
+              "play"
+            ]
+          }
         }
       }
     },
@@ -1668,7 +1682,7 @@
           "face": {
             "type": "method",
             "args": {
-              "method_name": "plain_scenario"
+              "method_name": "filer_caption"
             }
           },
           "link": {
@@ -1783,7 +1797,7 @@
           "face": {
             "type": "method",
             "args": {
-              "method_name": "revision"
+              "method_name": "filer_caption"
             }
           },
           "link": {