kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Wrap issue description and its contextual menu in a div (#12211).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10728 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-10-27 08:35:19 +00:00
parent 8a2786c91e
commit 29a474b641
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/issues/show.html.erb
View File

@ -71,6 +71,7 @@ end %>
<% if @issue.description? || @issue.attachments.any? -%> <% if @issue.description? || @issue.attachments.any? -%>
<hr /> <hr />
<% if @issue.description? %> <% if @issue.description? %>
<div class="description">
<div class="contextual"> <div class="contextual">
<%= link_to l(:button_quote), <%= link_to l(:button_quote),
{:controller => 'journals', :action => 'new', :id => @issue}, {:controller => 'journals', :action => 'new', :id => @issue},
@ -83,6 +84,7 @@ end %>
<div class="wiki"> <div class="wiki">
<%= textilizable @issue, :description, :attachments => @issue.attachments %> <%= textilizable @issue, :description, :attachments => @issue.attachments %>
</div> </div>
</div>
<% end %> <% end %>
<%= link_to_attachments @issue, :thumbnails => true %> <%= link_to_attachments @issue, :thumbnails => true %>
<% end -%> <% end -%>

2
test/functional/issues_controller_test.rb
View File

@ -827,6 +827,8 @@ class IssuesControllerTest < ActionController::TestCase
assert_template 'show' assert_template 'show'
assert_equal Issue.find(1), assigns(:issue) assert_equal Issue.find(1), assigns(:issue)
assert_select 'div.issue div.description', :text => /Unable to print recipes/
# anonymous role is allowed to add a note # anonymous role is allowed to add a note
assert_select 'form#issue-form' do assert_select 'form#issue-form' do
assert_select 'fieldset' do assert_select 'fieldset' do