Browse Source

Adds a link to container on attachments edit form.

git-svn-id: http://svn.redmine.org/redmine/trunk@17722 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.1.0
Jean-Philippe Lang 5 years ago
parent
commit
887b8d2fdf

+ 5
- 3
app/controllers/attachments_controller.rb View File

@@ -164,8 +164,10 @@ class AttachmentsController < ApplicationController

# Returns the menu item that should be selected when viewing an attachment
def current_menu_item
if @attachment
case @attachment.container
container = @attachment.try(:container) || @container

if container
case container
when WikiPage
:wiki
when Message
@@ -173,7 +175,7 @@ class AttachmentsController < ApplicationController
when Project, Version
:files
else
@attachment.container.class.name.pluralize.downcase.to_sym
container.class.name.pluralize.downcase.to_sym
end
end
end

+ 3
- 1
app/views/attachments/edit_all.html.erb View File

@@ -1,4 +1,6 @@
<h2><%= l(:label_edit_attachments) %></h2>
<h2>
<%= safe_join([link_to_attachment_container(@container), l(:label_edit_attachments)].compact, ' » ') %>
</h2>

<%= error_messages_for *@attachments %>


+ 3
- 0
test/functional/attachments_controller_test.rb View File

@@ -463,6 +463,9 @@ class AttachmentsControllerTest < Redmine::ControllerTest
assert_select 'input[name=?][value=?]', 'attachments[4][description]', 'This is a Ruby source file'
end
end

# Link to the container in heading
assert_select 'h2 a', :text => "Feature request #2"
end

def test_edit_all_with_invalid_container_class_should_return_404

Loading…
Cancel
Save