diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-08-26 12:29:53 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-08-26 12:29:53 +0000 |
| commit | 8da5bad29516be6cbe1bc52e78837ac1ec292026 (patch) | |
| tree | ec32a3548a51d0f3f1e33920e17bc54e2b40460c /app/controllers | |
| parent | 452a20a69a574346f9ae8876e5402aabb11edbd5 (diff) | |
| download | redmine-8da5bad29516be6cbe1bc52e78837ac1ec292026.tar.gz redmine-8da5bad29516be6cbe1bc52e78837ac1ec292026.zip | |
Fixed: queries with multiple custom fields return no result.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@668 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/feeds_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/projects_controller.rb | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb index aaba4ac57..0601b8a5e 100644 --- a/app/controllers/feeds_controller.rb +++ b/app/controllers/feeds_controller.rb @@ -45,7 +45,7 @@ class FeedsController < ApplicationController end Issue.with_scope(:find => @find_options) do - @issues = Issue.find :all, :include => [:project, :author, :tracker, :status, :custom_values], + @issues = Issue.find :all, :include => [:project, :author, :tracker, :status], :order => "#{Issue.table_name}.created_on DESC" end @title = (@project ? @project.name : Setting.app_title) + ": " + (query ? query.name : l(:label_reported_issues)) @@ -65,7 +65,7 @@ class FeedsController < ApplicationController end Journal.with_scope(:find => @find_options) do - @journals = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status, :custom_values]} ], + @journals = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status]} ], :order => "#{Journal.table_name}.created_on DESC" end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 86248e498..0613f9e40 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -290,10 +290,10 @@ class ProjectsController < ApplicationController end if @query.valid? - @issue_count = Issue.count(:include => [:status, :project, :custom_values], :conditions => @query.statement) + @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement) @issue_pages = Paginator.new self, @issue_count, @results_per_page, params['page'] @issues = Issue.find :all, :order => sort_clause, - :include => [ :assigned_to, :status, :tracker, :project, :priority, :custom_values ], + :include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => @query.statement, :limit => @issue_pages.items_per_page, :offset => @issue_pages.current.offset @@ -369,7 +369,7 @@ class ProjectsController < ApplicationController render :action => 'list_issues' and return unless @query.valid? @issues = Issue.find :all, :order => sort_clause, - :include => [ :author, :status, :tracker, :priority, :project, :custom_values ], + :include => [ :author, :status, :tracker, :priority, :project ], :conditions => @query.statement, :limit => Setting.issues_export_limit.to_i |