Browse Source

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

git-svn-id: http://svn.redmine.org/redmine/trunk@15924 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.4.0
Jean-Philippe Lang 7 years ago
parent
commit
858cb0bd78

+ 1
- 1
app/controllers/context_menus_controller.rb View File

@@ -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?

+ 1
- 1
app/controllers/timelog_controller.rb View File

@@ -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

Loading…
Cancel
Save