diff --git a/app/helpers/my_helper.rb b/app/helpers/my_helper.rb index 8320749fc..bdda8302f 100644 --- a/app/helpers/my_helper.rb +++ b/app/helpers/my_helper.rb @@ -96,6 +96,8 @@ module MyHelper def render_issuesassignedtome_block(block, settings) query = IssueQuery.new(:name => l(:label_assigned_to_me_issues), :user => User.current) query.add_filter 'assigned_to_id', '=', ['me'] + query.add_available_filter('project.status', :type => :integer) + query.add_filter 'project.status', '=', ["#{Project::STATUS_ACTIVE}"] query.column_names = settings[:columns].presence || ['project', 'tracker', 'status', 'subject'] query.sort_criteria = settings[:sort].presence || [['priority', 'desc'], ['updated_on', 'desc']] issues = query.issues(:limit => 10) @@ -106,6 +108,8 @@ module MyHelper def render_issuesreportedbyme_block(block, settings) query = IssueQuery.new(:name => l(:label_reported_issues), :user => User.current) query.add_filter 'author_id', '=', ['me'] + query.add_available_filter('project.status', :type => :integer) + query.add_filter 'project.status', '=', ["#{Project::STATUS_ACTIVE}"] query.column_names = settings[:columns].presence || ['project', 'tracker', 'status', 'subject'] query.sort_criteria = settings[:sort].presence || [['updated_on', 'desc']] issues = query.issues(:limit => 10) diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb index c342dc456..2bd334bb4 100644 --- a/app/models/issue_query.rb +++ b/app/models/issue_query.rb @@ -543,6 +543,10 @@ class IssueQuery < Query end end + def sql_for_project_status_field(field, operator, value) + '(' + sql_for_field(field, operator, value, Project.table_name, "status") + ')' + end + def sql_for_relations(field, operator, value, options={}) relation_options = IssueRelation::TYPES[field] return relation_options unless relation_options