| @@ -267,7 +267,7 class CustomField < ActiveRecord::Base | |||||
| 267 | "1=0" |
|
267 | "1=0" | |
| 268 | else |
|
268 | else | |
| 269 | project_key ||= "#{self.class.customized_class.table_name}.project_id" |
|
269 | project_key ||= "#{self.class.customized_class.table_name}.project_id" | |
| 270 |
"#{project_key} IN (SELECT DISTINCT m.project_id FROM #{Member.table_name} m" + |
|
270 | "#{project_key} IN (SELECT DISTINCT m.project_id FROM #{Member.table_name} m" + | |
| 271 | " INNER JOIN #{MemberRole.table_name} mr ON mr.member_id = m.id" + |
|
271 | " INNER JOIN #{MemberRole.table_name} mr ON mr.member_id = m.id" + | |
| 272 | " INNER JOIN #{table_name_prefix}custom_fields_roles#{table_name_suffix} cfr ON cfr.role_id = mr.role_id" + |
|
272 | " INNER JOIN #{table_name_prefix}custom_fields_roles#{table_name_suffix} cfr ON cfr.role_id = mr.role_id" + | |
| 273 | " WHERE m.user_id = #{user.id} AND cfr.custom_field_id = #{id})" |
|
273 | " WHERE m.user_id = #{user.id} AND cfr.custom_field_id = #{id})" | |
| @@ -280,7 +280,7 class CustomField < ActiveRecord::Base | |||||
| 280 | elsif user.anonymous? |
|
280 | elsif user.anonymous? | |
| 281 | "#{table_name}.visible" |
|
281 | "#{table_name}.visible" | |
| 282 | else |
|
282 | else | |
| 283 |
"#{project_key} IN (SELECT DISTINCT m.project_id FROM #{Member.table_name} m" + |
|
283 | "#{project_key} IN (SELECT DISTINCT m.project_id FROM #{Member.table_name} m" + | |
| 284 | " INNER JOIN #{MemberRole.table_name} mr ON mr.member_id = m.id" + |
|
284 | " INNER JOIN #{MemberRole.table_name} mr ON mr.member_id = m.id" + | |
| 285 | " INNER JOIN #{table_name_prefix}custom_fields_roles#{table_name_suffix} cfr ON cfr.role_id = mr.role_id" + |
|
285 | " INNER JOIN #{table_name_prefix}custom_fields_roles#{table_name_suffix} cfr ON cfr.role_id = mr.role_id" + | |
| 286 | " WHERE m.user_id = #{user.id} AND cfr.custom_field_id = #{id})" |
|
286 | " WHERE m.user_id = #{user.id} AND cfr.custom_field_id = #{id})" | |
General Comments 0
You need to be logged in to leave comments.
Login now