Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-10 07:16:03 +01:00
Code Issues Packages Projects Releases Activity

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

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@15924 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2016-10-23 11:51:26 +00:00
parent 73ef85f672
commit 858cb0bd78
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/context_menus_controller.rb
View File

@@ -75,7 +75,7 @@ class ContextMenusController < ApplicationController
@options_by_custom_field = {} @options_by_custom_field = {}
if @can[:edit] 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| custom_fields.each do |field|
values = field.possible_values_options(@projects) values = field.possible_values_options(@projects)
if values.present? if values.present?

2
app/controllers/timelog_controller.rb
View File

@@ -168,7 +168,7 @@ class TimelogController < ApplicationController
def bulk_edit def bulk_edit
@available_activities = TimeEntryActivity.shared.active @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 end
def bulk_update def bulk_update