@@ -30,7 +30,8 @@
| <%= file.digest %> |
<% if delete_allowed %>
- <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file}, :confirm => l(:text_are_you_sure), :method => :post %>
+ <%= link_to image_tag('delete.png'), {:controller => 'attachments', :action => 'destroy', :id => file},
+ :confirm => l(:text_are_you_sure), :method => :post %>
|
<% end %>
diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml
index 844c6c0f..1cb67dfd 100644
--- a/app/views/wiki/show.rhtml
+++ b/app/views/wiki/show.rhtml
@@ -28,7 +28,7 @@
<%= render(:partial => "wiki/content", :locals => {:content => @content}) %>
-<%= link_to_attachments @page.attachments, :delete_url => ((@editable && authorize_for('wiki', 'destroy_attachment')) ? {:controller => 'wiki', :action => 'destroy_attachment', :page => @page.title} : nil) %>
+<%= link_to_attachments @page %>
<% if @editable && authorize_for('wiki', 'add_attachment') %>
<%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 42b074a5..c8d64b8c 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -35,7 +35,7 @@ Redmine::AccessControl.map do |map|
:queries => :index,
:reports => :issue_report}, :public => true
map.permission :add_issues, {:issues => :new}
- map.permission :edit_issues, {:issues => [:edit, :reply, :bulk_edit, :destroy_attachment]}
+ map.permission :edit_issues, {:issues => [:edit, :reply, :bulk_edit]}
map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
map.permission :add_issue_notes, {:issues => [:edit, :reply]}
map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
@@ -67,12 +67,12 @@ Redmine::AccessControl.map do |map|
end
map.project_module :documents do |map|
- map.permission :manage_documents, {:documents => [:new, :edit, :destroy, :add_attachment, :destroy_attachment]}, :require => :loggedin
+ map.permission :manage_documents, {:documents => [:new, :edit, :destroy, :add_attachment]}, :require => :loggedin
map.permission :view_documents, :documents => [:index, :show, :download]
end
map.project_module :files do |map|
- map.permission :manage_files, {:projects => :add_file, :versions => :destroy_file}, :require => :loggedin
+ map.permission :manage_files, {:projects => :add_file}, :require => :loggedin
map.permission :view_files, :projects => :list_files, :versions => :download
end
@@ -83,7 +83,7 @@ Redmine::AccessControl.map do |map|
map.permission :view_wiki_pages, :wiki => [:index, :special]
map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate]
map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment]
- map.permission :delete_wiki_pages_attachments, :wiki => :destroy_attachment
+ map.permission :delete_wiki_pages_attachments, {}
map.permission :protect_wiki_pages, {:wiki => :protect}, :require => :member
end
diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index 139896ce..e566f2c4 100644
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_test.rb
@@ -76,4 +76,33 @@ class AttachmentsControllerTest < Test::Unit::TestCase
get :download, :id => 7
assert_redirected_to 'account/login'
end
+
+ def test_destroy_issue_attachment
+ issue = Issue.find(3)
+ @request.session[:user_id] = 2
+
+ assert_difference 'issue.attachments.count', -1 do
+ post :destroy, :id => 1
+ end
+ # no referrer
+ assert_redirected_to 'projects/show/ecookbook'
+ assert_nil Attachment.find_by_id(1)
+ j = issue.journals.find(:first, :order => 'created_on DESC')
+ assert_equal 'attachment', j.details.first.property
+ assert_equal '1', j.details.first.prop_key
+ assert_equal 'error281.txt', j.details.first.old_value
+ end
+
+ def test_destroy_wiki_page_attachment
+ @request.session[:user_id] = 2
+ assert_difference 'Attachment.count', -1 do
+ post :destroy, :id => 3
+ end
+ end
+
+ def test_destroy_without_permission
+ post :destroy, :id => 3
+ assert_redirected_to '/login'
+ assert Attachment.find_by_id(3)
+ end
end
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 8bd1af56..86340ba6 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -713,17 +713,4 @@ class IssuesControllerTest < Test::Unit::TestCase
assert_equal 2, TimeEntry.find(1).issue_id
assert_equal 2, TimeEntry.find(2).issue_id
end
-
- def test_destroy_attachment
- issue = Issue.find(3)
- a = issue.attachments.size
- @request.session[:user_id] = 2
- post :destroy_attachment, :id => 3, :attachment_id => 1
- assert_redirected_to 'issues/show/3'
- assert_nil Attachment.find_by_id(1)
- issue.reload
- assert_equal((a-1), issue.attachments.size)
- j = issue.journals.find(:first, :order => 'created_on DESC')
- assert_equal 'attachment', j.details.first.property
- end
end
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 053b8630..b5325357 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -251,11 +251,4 @@ class WikiControllerTest < Test::Unit::TestCase
assert_response :success
assert_template 'edit'
end
-
- def test_destroy_attachment
- @request.session[:user_id] = 2
- assert_difference 'Attachment.count', -1 do
- post :destroy_attachment, :id => 1, :page => 'Page_with_an_inline_image', :attachment_id => 3
- end
- end
end
diff --git a/vendor/plugins/acts_as_attachable/init.rb b/vendor/plugins/acts_as_attachable/init.rb
new file mode 100644
index 00000000..213e1d4b
--- /dev/null
+++ b/vendor/plugins/acts_as_attachable/init.rb
@@ -0,0 +1,2 @@
+require File.dirname(__FILE__) + '/lib/acts_as_attachable'
+ActiveRecord::Base.send(:include, Redmine::Acts::Attachable)
diff --git a/vendor/plugins/acts_as_attachable/lib/acts_as_attachable.rb b/vendor/plugins/acts_as_attachable/lib/acts_as_attachable.rb
new file mode 100644
index 00000000..78d42c21
--- /dev/null
+++ b/vendor/plugins/acts_as_attachable/lib/acts_as_attachable.rb
@@ -0,0 +1,57 @@
+# Redmine - project management software
+# Copyright (C) 2006-2008 Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+module Redmine
+ module Acts
+ module Attachable
+ def self.included(base)
+ base.extend ClassMethods
+ end
+
+ module ClassMethods
+ def acts_as_attachable(options = {})
+ cattr_accessor :attachable_options
+ self.attachable_options = {}
+ attachable_options[:view_permission] = options.delete(:view_permission) || "view_#{self.name.pluralize.underscore}".to_sym
+ attachable_options[:delete_permission] = options.delete(:delete_permission) || "edit_#{self.name.pluralize.underscore}".to_sym
+
+ has_many :attachments, options.merge(:as => :container,
+ :order => "#{Attachment.table_name}.created_on",
+ :dependent => :destroy)
+ send :include, Redmine::Acts::Attachable::InstanceMethods
+ end
+ end
+
+ module InstanceMethods
+ def self.included(base)
+ base.extend ClassMethods
+ end
+
+ def attachments_visible?(user=User.current)
+ user.allowed_to?(self.class.attachable_options[:view_permission], self.project)
+ end
+
+ def attachments_deletable?(user=User.current)
+ user.allowed_to?(self.class.attachable_options[:delete_permission], self.project)
+ end
+
+ module ClassMethods
+ end
+ end
+ end
+ end
+end