Skip to content

Commit

Permalink
Fixed a schema conflict that is seen in Redmine 2.4.1.stable with the…
Browse files Browse the repository at this point in the history
… queries table.
  • Loading branch information
ajacques committed Jan 5, 2014
1 parent 0ca4ca7 commit 0670c47
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion app/controllers/mylyn_connector/queries_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def all
@queries = Query.find(
:all,
:joins => ["left join #{Project.table_name} on project_id=#{Project.table_name}.id"],
:conditions => ["(#{Query.table_name}.is_public = ? OR #{Query.table_name}.user_id = ?) AND (project_id IS NULL OR " << Project.visible_condition(User.current) << ")", true, User.current.id],
:conditions => ["(#{Query.table_name}.visibility >= 1 OR #{Query.table_name}.user_id = ?) AND (project_id IS NULL OR " << Project.visible_condition(User.current) << ")", User.current.id],
:order => "#{Query.table_name}.name ASC"
)

Expand Down

1 comment on commit 0670c47

@koppor
Copy link

@koppor koppor commented on 0670c47 Jan 13, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has also been fixed in tchx84@e7cee8a, which is a pull request at danmunn#21

Please sign in to comment.