From: Go MAEDA <maeda@farend.jp>
Date: Sat, 16 Feb 2019 00:35:24 +0000 (+0000)
Subject: Merged r17869 from trunk to 4.0-stable (#30718).
X-Git-Tag: 4.0.2~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=10ad1e6006571214dbef314f84dea6e32903706c;p=redmine.git

Merged r17869 from trunk to 4.0-stable (#30718).


git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17872 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

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 1e8080b86..552b9faad 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -581,10 +581,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