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

cleanup: rubocop: fix Layout/AlignArguments in app/models/custom_field.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@18996 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2019-11-09 09:17:45 +00:00
parent a4f3b8882d
commit 58b2d8e627
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/custom_field.rb
View File

@ -55,10 +55,11 @@ class CustomField < ActiveRecord::Base
if user.admin?
# nop
elsif user.memberships.any?
where("#{table_name}.visible = ? OR #{table_name}.id IN (SELECT DISTINCT cfr.custom_field_id FROM #{Member.table_name} m" +
" INNER JOIN #{MemberRole.table_name} mr ON mr.member_id = m.id" +
" INNER JOIN #{table_name_prefix}custom_fields_roles#{table_name_suffix} cfr ON cfr.role_id = mr.role_id" +
" WHERE m.user_id = ?)",
where(
"#{table_name}.visible = ? OR #{table_name}.id IN (SELECT DISTINCT cfr.custom_field_id FROM #{Member.table_name} m" +
" INNER JOIN #{MemberRole.table_name} mr ON mr.member_id = m.id" +
" INNER JOIN #{table_name_prefix}custom_fields_roles#{table_name_suffix} cfr ON cfr.role_id = mr.role_id" +
" WHERE m.user_id = ?)",
true, user.id)
else
where(:visible => true)
@ -68,7 +69,8 @@ class CustomField < ActiveRecord::Base
visible? || user.admin?
end
safe_attributes 'name',
safe_attributes(
'name',
'field_format',
'possible_values',
'regexp',
@ -91,7 +93,7 @@ class CustomField < ActiveRecord::Base
'user_role',
'version_status',
'extensions_allowed',
'full_width_layout'
'full_width_layout')
def format
@format ||= Redmine::FieldFormat.find(field_format)