meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-03 23:53:23 +00:00
Code Issues Releases Wiki Activity

Show open/closed badge on issue page (#33254).

Browse Source 
Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@19719 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2020-04-23 10:13:10 +00:00
parent f19c291b59
commit 6e232ad13e
7 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/helpers/issue_statuses_helper.rb
View File

@ -18,4 +18,11 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
module IssueStatusesHelper
def issue_status_type_badge(status)
if status.is_closed?
content_tag('span', l(:label_closed_issues), class: 'badge badge-status-closed')
else
content_tag('span', l(:label_open_issues), class: 'badge badge-status-open')
end
end
end

1
app/helpers/issues_helper.rb
View File

@ -20,6 +20,7 @@
module IssuesHelper
include ApplicationHelper
include Redmine::Export::PDF::IssuesPdfHelper
include IssueStatusesHelper
def issue_list(issues, &block)
ancestors = []

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

@ -1,6 +1,7 @@
<%= render :partial => 'action_menu' %>
<h2><%= issue_heading(@issue) %></h2>
<h2 class="inline-flex"><%= issue_heading(@issue) %></h2>
<%= issue_status_type_badge(@issue.status) %>
<div class="<%= @issue.css_classes %> details">
<% if @prev_issue_id || @next_issue_id %>

2
app/views/versions/index.html.erb
View File

@ -22,7 +22,7 @@
</div>
<% end %>
<header>
<h3 class="icon icon-package version"><%= link_to_version version, :name => version_anchor(version) %></h3>
<h3 class="icon icon-package version inline-flex"><%= link_to_version version, :name => version_anchor(version) %></h3>
<span class="badge badge-status-<%= version.status %>"><%= l("version_status_#{version.status}") %></span>
</header>
<%= render :partial => 'versions/overview', :locals => {:version => version} %>

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

@ -7,7 +7,7 @@
</div>
<div id="roadmap" class="<%= @version.css_classes %>">
<h2><%= @version.name %></h2>
<h2 class="inline-flex"><%= @version.name %></h2>
<span class="badge badge-status-<%= @version.status %>"><%= l("version_status_#{@version.status}") %></span>
<%= render :partial => 'versions/overview', :locals => {:version => @version} %>

4
public/stylesheets/application.css
View File

@ -132,6 +132,7 @@ div.modal .box p {margin: 0.3em 0;}
.mobile-show {display: none;}
.hidden {display: none;}
.inline-flex {display: inline-flex;}
/***** Links *****/
a, a:link, a:visited{ color: #169; text-decoration: none; }
@ -532,6 +533,7 @@ div.issue .attributes .attribute {padding-left:180px; clear:left; min-height: 1.
div.issue .attributes .attribute .label {width: 170px; margin-left:-180px; font-weight:bold; float:left; overflow:hidden; text-overflow: ellipsis;}
div.issue .attribute .value {overflow:auto; text-overflow: ellipsis;}
div.issue.overdue .due-date .value { color: #c22; }
body.controller-issues h2.inline-flex {padding-right: 0}
#issue_tree table.issues, #relations table.issues { border: 0; }
#issue_tree td.checkbox, #relations td.checkbox {display:none;}
@ -614,7 +616,7 @@ div#roadmap .related-issues td.assigned_to img { padding-left: 4px; padding-righ
div#roadmap .wiki h1:first-child { display: none; }
div#roadmap .wiki h1 { font-size: 120%; }
div#roadmap .wiki h2 { font-size: 110%; }
div#roadmap h2, div#roadmap h3 { display: inline; padding-right: 0;}
div#roadmap h2, div#roadmap h3 {padding-right: 0;}
body.controller-versions.action-show div#roadmap .related-issues {width:70%;}
div#version-summary { float:right; width:28%; margin-left: 16px; margin-bottom: 16px; background-color: #fff; }

14
test/functional/issues_controller_test.rb
View File

@ -2995,6 +2995,20 @@ class IssuesControllerTest < Redmine::ControllerTest
end
end
def test_show_should_display_open_badge_for_open_issue
get :show, params: {id: 1}
assert_response :success
assert_select 'span.badge.badge-status-open', text: 'open'
end
def test_show_should_display_closed_badge_for_closed_issue
get :show, params: {id: 8}
assert_response :success
assert_select 'span.badge.badge-status-closed', text: 'closed'
end
def test_get_new
@request.session[:user_id] = 2
get(