diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb index 5e709fe..b975cd7 100644 --- a/app/models/issue_query.rb +++ b/app/models/issue_query.rb @@ -158,6 +158,7 @@ class IssueQuery < Query project_values = [] if User.current.logged? && User.current.memberships.any? project_values << ["<< #{l(:label_my_projects).downcase} >>", "mine"] + project_values << ["<< #{l(:label_opened_projects).downcase} >>", "opened"] end project_values += all_projects_values add_available_filter("project_id", diff --git a/app/models/query.rb b/app/models/query.rb index e091fa7..087e51a 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -579,6 +579,12 @@ class Query < ActiveRecord::Base if v.delete('mine') v += User.current.memberships.map(&:project_id).map(&:to_s) end + if v.delete('opened') + v += User.current.memberships.joins(:project). + where(projects: { status: Project::STATUS_ACTIVE }). + map(&:project_id). + map(&:to_s) + end end if field =~ /cf_(\d+)$/ diff --git a/config/locales/en.yml b/config/locales/en.yml index 311aac8..edfbcb0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -561,6 +561,7 @@ en: label_my_page: My page label_my_account: My account label_my_projects: My projects + label_opened_projects: My Opened projects label_my_page_block: My page block label_administration: Administration label_login: Sign in diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 4e1bcc1..ddb628e 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -508,6 +508,7 @@ pl: label_my_account: Moje konto label_my_page: Moja strona label_my_projects: Moje projekty + label_opened_projects: Moje Otwarte Projekty label_new: Nowy label_new_statuses_allowed: Uprawnione nowe statusy label_news: Komunikat