mirror of
https://github.com/meineerde/redmine.git
synced 2026-02-04 08:03:23 +00:00
Adds a link to container on attachments edit form.
git-svn-id: http://svn.redmine.org/redmine/trunk@17722 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
039580b73d
commit
887b8d2fdf
@ -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
|
||||
|
||||
@ -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 %>
|
||||
|
||||
|
||||
@ -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…
x
Reference in New Issue
Block a user