merge

[pettanr/pettanr.git] / lib / manifest / local / view / filer / body / file_body / file_item / caption / default / link / link.rb

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 648445a..e42feb5 100644 (file)
--- 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_path + @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