summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/controllers/attachments_controller.rb2
-rw-r--r--app/views/attachments/_links.html.erb4
-rw-r--r--app/views/files/index.html.erb4
3 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 9e6dd4cb8..55cef02a8 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -53,7 +53,7 @@ class AttachmentsController < ApplicationController
end
- verify :method => :post, :only => :destroy
+ verify :method => :delete, :only => :destroy
def destroy
# Make sure association callbacks are called
@attachment.container.attachments.delete(@attachment)
diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb
index 4f4e2d180..c92599a66 100644
--- a/app/views/attachments/_links.html.erb
+++ b/app/views/attachments/_links.html.erb
@@ -4,9 +4,9 @@
<%= h(" - #{attachment.description}") unless attachment.description.blank? %>
<span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
<% if options[:deletable] %>
- <%= link_to image_tag('delete.png'), {:controller => 'attachments', :action => 'destroy', :id => attachment},
+ <%= link_to image_tag('delete.png'), attachment_path(attachment),
:confirm => l(:text_are_you_sure),
- :method => :post,
+ :method => :delete,
:class => 'delete',
:title => l(:button_delete) %>
<% end %>
diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index a1b884850..397ca5c65 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -33,8 +33,8 @@
<td class="downloads"><%= file.downloads %></td>
<td class="digest"><%= file.digest %></td>
<td align="center">
- <%= link_to(image_tag('delete.png'), {:controller => 'attachments', :action => 'destroy', :id => file},
- :confirm => l(:text_are_you_sure), :method => :post) if delete_allowed %>
+ <%= link_to(image_tag('delete.png'), attachment_path(file),
+ :confirm => l(:text_are_you_sure), :method => :delete) if delete_allowed %>
</td>
</tr>
<% end