From 0dd66a1508a4e971b3e0e26f734fa5ea340e1440 Mon Sep 17 00:00:00 2001 From: akrstjp Date: Wed, 2 Sep 2015 22:32:43 +0900 Subject: [PATCH] enable/disabling an avatar/project/subject for tooltip --- app/views/quick_view_issues/_settings.html.erb | 4 ++-- .../quick_view_issues/quick_view_portrait.html.erb | 24 ++++++++++++++++++++-- init.rb | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/app/views/quick_view_issues/_settings.html.erb b/app/views/quick_view_issues/_settings.html.erb index 2908d10..57600bb 100644 --- a/app/views/quick_view_issues/_settings.html.erb +++ b/app/views/quick_view_issues/_settings.html.erb @@ -19,8 +19,8 @@ Tooltip attributes: - + <%= options_for_select [:avatar, :project, :subject, :status, :priority, :category, :fixed_version, :assigned_to, :start_date, :due_date, :done_ratio, :estimated_hours, :spent_time, :description], settings['tooltip_attributes'] %> diff --git a/app/views/quick_view_issues/quick_view_portrait.html.erb b/app/views/quick_view_issues/quick_view_portrait.html.erb index 58a3896..59b9560 100644 --- a/app/views/quick_view_issues/quick_view_portrait.html.erb +++ b/app/views/quick_view_issues/quick_view_portrait.html.erb @@ -10,16 +10,33 @@ issue = @issue project = @issue.project desired_attributes = Setting.plugin_quick_view['tooltip_attributes'] + require_header = desired_attributes.any? do |attr| + ['avatar', 'project', 'subject'].include?(attr) + end + require_body = desired_attributes.any? do |attr| + ['status', 'priority' 'category', 'fixed_version', 'assigned_to', 'start_date', 'due_date', 'done_ratio', 'estimated_hours', 'spent_time'].include?(attr) + end logger.info "### QUICK VIEW ### " + desired_attributes.inspect %> +<% if require_header %>
+ <% if desired_attributes.include? 'avatar' %> <%= avatar(@issue.author, :size => "50") %> + <% end %> + <% if desired_attributes.include? 'project' %>
<<%= project.name %>>
+ <% end %> + <% if desired_attributes.include? 'subject' %>
<%= render_issue_subject_with_tree(issue) %>
+ <% end %>
+<% end %> +<% if require_header && require_body %>
+<% end %> +<% if require_body %> <% if desired_attributes.include? 'status' %> @@ -98,14 +115,17 @@ <% end %> <% end %>
+<% end %> <% if desired_attributes.include?('description') && @issue.description.present? %> -
+<% if require_header || require_body %> +
+<% end %>
<%= textilizable @issue, :description, :attachments => @issue.attachments %>
<% end %> <% if issue.created_on != issue.updated_on %> -
+
<%= l(:label_updated_time, time_tag(issue.updated_on)).html_safe %>. <% end %> diff --git a/init.rb b/init.rb index 53d14d1..61455a1 100644 --- a/init.rb +++ b/init.rb @@ -11,7 +11,7 @@ Redmine::Plugin.register :quick_view do settings :default => {'issue_dialog_size'=>'640,600', 'issue_tooltip_enabled'=>'on', - 'tooltip_attributes'=>[ :status , :priority , :category , :fixed_version , :assigned_to , :start_date , :due_date , :estimated_hours , :spent_time], + 'tooltip_attributes'=>[ :avatar, :project, :subject, :status , :priority , :category , :fixed_version , :assigned_to , :start_date , :due_date , :estimated_hours , :spent_time], 'worktime_ext_dialog_anchor_enabled'=>'on', 'worktime_ext_tooltip_enabled'=>'on'}, :partial => 'quick_view_issues/settings' -- 2.11.0