diff options
| -rw-r--r-- | app/models/project.rb | 6 | ||||
| -rw-r--r-- | app/models/query.rb | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 85d9cb43f..6d91d570a 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -24,12 +24,6 @@ class Project < ActiveRecord::Base STATUS_CLOSED = 5 STATUS_ARCHIVED = 9 - LABEL_BY_STATUS = { - 1 => l(:project_status_active), - 5 => l(:project_status_closed), - 9 => l(:project_status_archived), - } - # Maximum length for project identifiers IDENTIFIER_MAX_LENGTH = 100 diff --git a/app/models/query.rb b/app/models/query.rb index bfc6841c2..f6cc3bd2c 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -604,10 +604,10 @@ class Query < ActiveRecord::Base # Returns a scope of project statuses that are available as columns or filters def project_statuses_values - project_statuses = Project::LABEL_BY_STATUS - # Remove archived status from filters - project_statuses.delete(9) - project_statuses.stringify_keys.invert.to_a + [ + [l(:project_status_active), "#{Project::STATUS_ACTIVE}"], + [l(:project_status_closed), "#{Project::STATUS_CLOSED}"] + ] end # Adds available filters |