summaryrefslogtreecommitdiffstats
path: root/app/helpers/issues_helper.rb
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2018-04-02 01:42:01 +0000
committerGo MAEDA <maeda@farend.jp>2018-04-02 01:42:01 +0000
commita17661e8d80d042da4c1ac0eed218b979e3fbd46 (patch)
tree199c0992549f89fcfe4ef34dfa867f48cade94fa /app/helpers/issues_helper.rb
parented48b0708a7e0753b2e1f7916775069254c019b2 (diff)
downloadredmine-a17661e8d80d042da4c1ac0eed218b979e3fbd46.tar.gz
redmine-a17661e8d80d042da4c1ac0eed218b979e3fbd46.zip
Use button as additional option for contextmenu (#26655).
Patch by Felix Gliesche. git-svn-id: http://svn.redmine.org/redmine/trunk@17252 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers/issues_helper.rb')
-rw-r--r--app/helpers/issues_helper.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 972e6b9cb..d1aa97ae7 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -99,7 +99,8 @@ 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', child.disabled_core_fields.include?('done_ratio') ? '' : progress_bar(child.done_ratio), :class=> 'done_ratio') +
+ content_tag('td', link_to_context_menu, :class => 'buttons'),
:class => css)
end
s << '</table>'
@@ -114,7 +115,7 @@ module IssuesHelper
relations.each do |relation|
other_issue = relation.other_issue(issue)
css = "issue hascontextmenu #{other_issue.css_classes}"
- link = manage_relations ? link_to(l(:label_relation_delete),
+ buttons = manage_relations ? link_to(l(:label_relation_delete),
relation_path(relation),
:remote => true,
:method => :delete,
@@ -122,6 +123,7 @@ 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') +
@@ -130,7 +132,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', link, :class => 'buttons'),
+ content_tag('td', buttons, :class => 'buttons'),
:id => "relation-#{relation.id}",
:class => css)
end