From: yasushiito <yas@pen-chan.jp>
Date: Thu, 6 Feb 2014 02:52:22 +0000 (+0900)
Subject: fix filer
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4d902caa1c52c11265142aaa3ba76ce45fba520f;p=pettanr%2Fpettanr.git

fix filer
---

diff --git a/app/views/templates/r/filer/caption_face/_column.html.erb b/app/views/templates/r/filer/caption_face/_column.html.erb
new file mode 100644
index 00000000..40be8bdd
--- /dev/null
+++ b/app/views/templates/r/filer/caption_face/_column.html.erb
@@ -0,0 +1 @@
+<%= face.face %>
diff --git a/app/views/templates/r/filer/caption_face/_image.html.erb b/app/views/templates/r/filer/caption_face/_image.html.erb
deleted file mode 100644
index 241bdc8c..00000000
--- a/app/views/templates/r/filer/caption_face/_image.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= tag :img, face.tag_opt %>
diff --git a/app/views/templates/r/filer/caption_face/_method.html.erb b/app/views/templates/r/filer/caption_face/_method.html.erb
new file mode 100644
index 00000000..40be8bdd
--- /dev/null
+++ b/app/views/templates/r/filer/caption_face/_method.html.erb
@@ -0,0 +1 @@
+<%= face.face %>
diff --git a/app/views/templates/r/filer/caption_face/_none.html.erb b/app/views/templates/r/filer/caption_face/_none.html.erb
new file mode 100644
index 00000000..e69de29b
diff --git a/app/views/templates/r/filer/caption_face/_picture.html.erb b/app/views/templates/r/filer/caption_face/_picture.html.erb
deleted file mode 100644
index 241bdc8c..00000000
--- a/app/views/templates/r/filer/caption_face/_picture.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= tag :img, face.tag_opt %>
diff --git a/lib/manifest/filer/caption/default/face/face.rb b/lib/manifest/filer/caption/default/face/face.rb
index 8edff3fb..0459ed24 100644
--- a/lib/manifest/filer/caption/default/face/face.rb
+++ b/lib/manifest/filer/caption/default/face/face.rb
@@ -24,28 +24,28 @@ module Manifest
           end
           
           class ColumnFace < BaseFace
-            attr :name
+            attr :column_name
             def set_default
               super
-              @face_manifest['args']['name'] ||= 'caption'
+              @face_manifest['args']['column_name'] ||= 'caption'
             end
             
             def init
               super
-              @name = @args['name']
+              @column_name = @args['column_name']
             end
           end
           
           class MethodFace < BaseFace
-            attr :name
+            attr :method_name
             def set_default
               super
+              raise "undefined name for filers > #{self.caption.filer.filer_name} > caption > default > face\n" unless @face_manifest['args']['method_name']
             end
             
             def init
               super
-              raise "undefined name for filers > #{self.caption.filer.filer_name} > caption > default > face\n" unless @args['name']
-              @name = @args['name']
+              @method_name = @args['method_name']
             end
           end
           
diff --git a/lib/manifest/filer/caption/default/link/link.rb b/lib/manifest/filer/caption/default/link/link.rb
index e80554b0..9deb1c04 100644
--- a/lib/manifest/filer/caption/default/link/link.rb
+++ b/lib/manifest/filer/caption/default/link/link.rb
@@ -25,22 +25,21 @@ module Manifest
           end
           
           class ActionLink < BaseLink
-            attr  :name
+            attr  :action_name
             
             def set_default
               super
-              @link_manifest['args']['name'] ||= 'show'
+              @link_manifest['args']['action_name'] ||= 'show'
             end
             
             def init
               super
-              @name = @args['name']
+              @action_name = @args['action_name']
             end
             
           end
           
           class NoneLink < BaseLink
-            attr  :name
             
             def set_default
               super
@@ -53,16 +52,16 @@ module Manifest
           end
           
           class UrlColumnLink < BaseLink
-            attr  :name
+            attr  :column_name
             
             def set_default
               super
-              @link_manifest['args']['name'] ||= 'url'
+              @link_manifest['args']['column_name'] ||= 'url'
             end
             
             def init
               super
-              @name = @args['name']
+              @column_name = @args['column_name']
             end
             
           end
diff --git a/lib/manifest/filer/symbol/default/link/link.rb b/lib/manifest/filer/symbol/default/link/link.rb
index eaf2abc0..f842ab78 100644
--- a/lib/manifest/filer/symbol/default/link/link.rb
+++ b/lib/manifest/filer/symbol/default/link/link.rb
@@ -22,23 +22,19 @@ module Manifest
               @args = @link_manifest['args']
             end
             
-            def url
-              raise "undefined url\n"
-            end
-            
           end
           
           class ActionLink < BaseLink
-            attr  :name
+            attr  :action_name
             
             def set_default
               super
-              @link_manifest['args']['name'] ||= 'show'
+              @link_manifest['args']['action_name'] ||= 'show'
             end
             
             def init
               super
-              @name = @args['name']
+              @action_name = @args['action_name']
             end
             
             def url
@@ -48,7 +44,6 @@ module Manifest
           end
           
           class NoneLink < BaseLink
-            attr  :name
             
             def set_default
               super
@@ -58,27 +53,19 @@ module Manifest
               super
             end
             
-            def url
-              nil
-            end
-            
           end
           
           class UrlColumnLink < BaseLink
-            attr  :name
+            attr  :column_name
             
             def set_default
               super
-              @link_manifest['args']['name'] ||= 'url'
+              @link_manifest['args']['column_name'] ||= 'url'
             end
             
             def init
               super
-              @name = @args['name']
-            end
-            
-            def url
-              @name
+              @column_name = @args['column_name']
             end
             
           end
diff --git a/lib/manifest/local/view/filer/body/file_body/file_item/caption/default/face/face.rb b/lib/manifest/local/view/filer/body/file_body/file_item/caption/default/face/face.rb
index 662160e5..954ac1c3 100644
--- a/lib/manifest/local/view/filer/body/file_body/file_item/caption/default/face/face.rb
+++ b/lib/manifest/local/view/filer/body/file_body/file_item/caption/default/face/face.rb
@@ -43,10 +43,10 @@ module Manifest
                   
                   class ColumnFace < BaseFace
                     def template_file_name
-                      'image'
+                      'column'
                     end
                     
-                    def url
+                    def face
                       @item.attributes[@face_manifest.column_name]
                     end
                     
@@ -54,26 +54,18 @@ module Manifest
                   
                   class MethodFace < BaseFace
                     def template_file_name
-                      'image'
+                      'method'
                     end
                     
-                    def url
-                      @face_manifest.url
+                    def face
+                      @item.__send__ @face_manifest.method_name
                     end
                     
                   end
                   
                   class NoneFace < BaseFace
                     def template_file_name
-                      'image'
-                    end
-                    
-                    def url
-                      @face_manifest.url
-                    end
-                    
-                    def tag_opt
-                      {:src => self.url, :width => Manifest.manifest.magic_numbers['thumbnail_width'], :height => Manifest.manifest.magic_numbers['thumbnail_height']}
+                      'none'
                     end
                     
                   end
diff --git a/lib/manifest/local/view/filer/body/file_body/file_item/caption/default/link/link.rb b/lib/manifest/local/view/filer/body/file_body/file_item/caption/default/link/link.rb
index 648445ac..f8a38996 100644
--- a/lib/manifest/local/view/filer/body/file_body/file_item/caption/default/link/link.rb
+++ b/lib/manifest/local/view/filer/body/file_body/file_item/caption/default/link/link.rb
@@ -22,16 +22,14 @@ module Manifest
                   end
                   
                   class ActionLink < BaseLink
-                    attr  :name
                     
                     def url
-                      '/' + @name
+                      '/' + @link_manifest.action_name + @item.id.to_s
                     end
                     
                   end
                   
                   class NoneLink < BaseLink
-                    attr  :name
                     
                     def url
                       nil
@@ -40,10 +38,9 @@ module Manifest
                   end
                   
                   class UrlColumnLink < BaseLink
-                    attr  :name
                     
                     def url
-                      @name
+                      @item.attributes[@link_manifest.column_name]
                     end
                     
                   end
diff --git a/lib/manifest/local/view/filer/body/file_body/file_item/symbol/default/link/link.rb b/lib/manifest/local/view/filer/body/file_body/file_item/symbol/default/link/link.rb
index 732ee448..3fb45898 100644
--- a/lib/manifest/local/view/filer/body/file_body/file_item/symbol/default/link/link.rb
+++ b/lib/manifest/local/view/filer/body/file_body/file_item/symbol/default/link/link.rb
@@ -22,16 +22,13 @@ module Manifest
                   end
                   
                   class ActionLink < BaseLink
-                    attr  :name
                     
                     def url
-                      '/' + @name
+                      '/' + @link_manifest.action_name + @item.id.to_s
                     end
-                    
                   end
                   
                   class NoneLink < BaseLink
-                    attr  :name
                     
                     def url
                       nil
@@ -40,10 +37,9 @@ module Manifest
                   end
                   
                   class UrlColumnLink < BaseLink
-                    attr  :name
                     
                     def url
-                      @name
+                      @item.attributes[@link_manifest.column_name]
                     end
                     
                   end
diff --git a/public/manifest.json b/public/manifest.json
index 2d79adda..b6a4e144 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -4849,8 +4849,10 @@
         "private_list": {},
         "by_author": {
           "type": "filter",
-          "from": "author",
-          "filter_key": "author_id"
+          "args": {
+            "filter_item_name": "author",
+            "filter_key": "author_id"
+          }
         },
         "by_panel": {
           "type": "through_filter",