support redmine-3.0

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 561d1e2..92af536 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,6 +1,18 @@
 #coding: utf-8
 
 module ApplicationHelper
+  def redmine_version()
+    Redmine::VERSION::MAJOR * 10 + Redmine::VERSION::MINOR
+  end
+
+  def editable(attribute_name, can)
+    if redmine_version() >= 30
+      return can[:edit]
+    else
+      return can[:update]
+    end
+  end
+
   def quick_edit_link_to(issue_ids, caption, attribute_name, additional_index, back_url, disabled)
      target_specifier = build_target_specifier(attribute_name, additional_index)
 

diff --git a/app/views/hooks/_quick_edit_context.html.erb b/app/views/hooks/_quick_edit_context.html.erb
index d98f49c..4d40c76 100644 (file)
--- a/app/views/hooks/_quick_edit_context.html.erb
+++ b/app/views/hooks/_quick_edit_context.html.erb
@@ -26,19 +26,19 @@
   <li class="folder">
     <a href="#" class="submenu"><%= l(:button_quick_edit) %></a>
     <ul>
-      <%= quick_edit_link_to(@issue_ids, get_attribute_caption(:subject), :subject, nil, back_url, !@can[:update]) %>
-      <%= quick_edit_link_to(@issue_ids, get_attribute_caption(:description), :description, nil, back_url, !@can[:update]) %>
-      <%= quick_edit_link_to(@issue_ids, get_attribute_caption(:parent_issue_id), :parent_issue_id, nil, back_url, !@can[:update]) %>
+      <%= quick_edit_link_to(@issue_ids, get_attribute_caption(:subject), :subject, nil, back_url, !editable(:subject,@can)) %>
+      <%= quick_edit_link_to(@issue_ids, get_attribute_caption(:description), :description, nil, back_url, !editable(:subject,@can)) %>
+      <%= quick_edit_link_to(@issue_ids, get_attribute_caption(:parent_issue_id), :parent_issue_id, nil, back_url, !editable(:subject,@can)) %>
       <% unless @issues.any? {|issue| issue.disabled_core_fields.include?('start_date') } %>
-      <%= quick_edit_link_to(@issue_ids, get_attribute_caption(:start_date), :start_date, nil, back_url, !@can[:update]) %>
+      <%= quick_edit_link_to(@issue_ids, get_attribute_caption(:start_date), :start_date, nil, back_url, !editable(:subject,@can)) %>
       <% end %>
 
       <% unless @issues.any? {|issue| issue.disabled_core_fields.include?('due_date') } %>
-      <%= quick_edit_link_to(@issue_ids, get_attribute_caption(:due_date), :due_date, nil, back_url, !@can[:update]) %>
+      <%= quick_edit_link_to(@issue_ids, get_attribute_caption(:due_date), :due_date, nil, back_url, !editable(:subject,@can)) %>
       <% end %>
 
       <% custom_fields.each do |f| %>
-      <%= quick_edit_link_to(@issue_ids, f.name, 'custom_field_values', f.id, back_url, !@can[:update]) %>
+      <%= quick_edit_link_to(@issue_ids, f.name, 'custom_field_values', f.id, back_url, !editable(:subject,@can)) %>
       <% end %>
 
       <% if @issues.size <= 2  %>