From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 23 Oct 2016 11:51:26 +0000 (+0000)
Subject: Don't bulk edit file custom fields (#6719).
X-Git-Tag: 3.4.0~631
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=858cb0bd7842727a67f293a910203237fb1fdfa6;p=redmine.git

Don't bulk edit file custom fields (#6719).

git-svn-id: http://svn.redmine.org/redmine/trunk@15924 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/context_menus_controller.rb b/app/controllers/context_menus_controller.rb
index bdec1fccf..b2f807cea 100644
--- a/app/controllers/context_menus_controller.rb
+++ b/app/controllers/context_menus_controller.rb
@@ -75,7 +75,7 @@ class ContextMenusController < ApplicationController
 
     @options_by_custom_field = {}
     if @can[:edit]
-      custom_fields = @time_entries.map(&:editable_custom_fields).reduce(:&).reject(&:multiple?)
+      custom_fields = @time_entries.map(&:editable_custom_fields).reduce(:&).reject(&:multiple?).select {|field| field.format.bulk_edit_supported}
       custom_fields.each do |field|
         values = field.possible_values_options(@projects)
         if values.present?
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index cab4a5d21..cb747b273 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -168,7 +168,7 @@ class TimelogController < ApplicationController
 
   def bulk_edit
     @available_activities = TimeEntryActivity.shared.active
-    @custom_fields = TimeEntry.first.available_custom_fields
+    @custom_fields = TimeEntry.first.available_custom_fields.select {|field| field.format.bulk_edit_supported}
   end
 
   def bulk_update