meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-20 23:41:12 +00:00
Code Issues Releases Wiki Activity

add space after comma to ApplicationController

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20134 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-10-11 12:56:36 +00:00
parent 9fbbfd6017
commit a6b68a82c6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/application_controller.rb
View File

@ -412,10 +412,10 @@ class ApplicationController < ActionController::Base
end end
def parse_params_for_bulk_update(params) def parse_params_for_bulk_update(params)
attributes = (params || {}).reject {|k,v| v.blank?} attributes = (params || {}).reject {|k, v| v.blank?}
attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'} attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
if custom = attributes[:custom_field_values] if custom = attributes[:custom_field_values]
custom.reject! {|k,v| v.blank?} custom.reject! {|k, v| v.blank?}
custom.keys.each do |k| custom.keys.each do |k|
if custom[k].is_a?(Array) if custom[k].is_a?(Array)
custom[k] << '' if custom[k].delete('__none__') custom[k] << '' if custom[k].delete('__none__')
@ -599,7 +599,7 @@ class ApplicationController < ActionController::Base
def render_feed(items, options={}) def render_feed(items, options={})
@items = (items || []).to_a @items = (items || []).to_a
@items.sort! {|x,y| y.event_datetime <=> x.event_datetime } @items.sort! {|x, y| y.event_datetime <=> x.event_datetime}
@items = @items.slice(0, Setting.feeds_limit.to_i) @items = @items.slice(0, Setting.feeds_limit.to_i)
@title = options[:title] || Setting.app_title @title = options[:title] || Setting.app_title
render :template => "common/feed", :formats => [:atom], :layout => false, render :template => "common/feed", :formats => [:atom], :layout => false,