diff options
| author | Go MAEDA <maeda@farend.jp> | 2018-04-02 02:24:35 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2018-04-02 02:24:35 +0000 |
| commit | fec2832fe316ebc9a02a6f1a86c6c909b0931adf (patch) | |
| tree | d8f3ddd86c706761a3c6415ae0b609d6991ebc9f /app/helpers/issues_helper.rb | |
| parent | 1046189079f0eee29d83d1b336ce57cabc51f5bc (diff) | |
| download | redmine-fec2832fe316ebc9a02a6f1a86c6c909b0931adf.tar.gz redmine-fec2832fe316ebc9a02a6f1a86c6c909b0931adf.zip | |
Reverted r17252 and r17253 (#26655).
The change breaks the test suite.
git-svn-id: http://svn.redmine.org/redmine/trunk@17254 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers/issues_helper.rb')
| -rw-r--r-- | app/helpers/issues_helper.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index d1aa97ae7..972e6b9cb 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -99,8 +99,7 @@ module IssuesHelper content_tag('td', link_to_issue(child, :project => (issue.project_id != child.project_id)), :class => 'subject', :style => 'width: 50%') + content_tag('td', h(child.status), :class => 'status') + content_tag('td', link_to_user(child.assigned_to), :class => 'assigned_to') + - content_tag('td', child.disabled_core_fields.include?('done_ratio') ? '' : progress_bar(child.done_ratio), :class=> 'done_ratio') + - content_tag('td', link_to_context_menu, :class => 'buttons'), + content_tag('td', child.disabled_core_fields.include?('done_ratio') ? '' : progress_bar(child.done_ratio), :class=> 'done_ratio'), :class => css) end s << '</table>' @@ -115,7 +114,7 @@ module IssuesHelper relations.each do |relation| other_issue = relation.other_issue(issue) css = "issue hascontextmenu #{other_issue.css_classes}" - buttons = manage_relations ? link_to(l(:label_relation_delete), + link = manage_relations ? link_to(l(:label_relation_delete), relation_path(relation), :remote => true, :method => :delete, @@ -123,7 +122,6 @@ module IssuesHelper :title => l(:label_relation_delete), :class => 'icon-only icon-link-break' ) : nil - buttons << link_to_context_menu s << content_tag('tr', content_tag('td', check_box_tag("ids[]", other_issue.id, false, :id => nil), :class => 'checkbox') + @@ -132,7 +130,7 @@ module IssuesHelper content_tag('td', other_issue.start_date, :class => 'start_date') + content_tag('td', other_issue.due_date, :class => 'due_date') + content_tag('td', other_issue.disabled_core_fields.include?('done_ratio') ? '' : progress_bar(other_issue.done_ratio), :class=> 'done_ratio') + - content_tag('td', buttons, :class => 'buttons'), + content_tag('td', link, :class => 'buttons'), :id => "relation-#{relation.id}", :class => css) end |