summaryrefslogtreecommitdiffstats
path: root/app/models/project.rb
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2019-03-17 13:36:03 +0000
committerGo MAEDA <maeda@farend.jp>2019-03-17 13:36:03 +0000
commitbd5977d97eaf92f852c1bfe499052b6b07ab8aae (patch)
tree714a9672c2007f78dbe7c2c5a649e24505ae9863 /app/models/project.rb
parent72a163d8b30978f23059ba2a2083675a38bd5680 (diff)
downloadredmine-bd5977d97eaf92f852c1bfe499052b6b07ab8aae.tar.gz
redmine-bd5977d97eaf92f852c1bfe499052b6b07ab8aae.zip
Support frozen_string_literal in app/**/*.rb (#26561).
Contributed by Pavel Rosický. git-svn-id: http://svn.redmine.org/redmine/trunk@17987 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/project.rb')
-rw-r--r--app/models/project.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index 75f99e397..04766c857 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
# Redmine - project management software
# Copyright (C) 2006-2017 Jean-Philippe Lang
@@ -181,7 +181,7 @@ class Project < ActiveRecord::Base
base_statement = (perm && perm.read? ? "#{Project.table_name}.status <> #{Project::STATUS_ARCHIVED}" : "#{Project.table_name}.status = #{Project::STATUS_ACTIVE}")
if !options[:skip_pre_condition] && perm && perm.project_module
# If the permission belongs to a project module, make sure the module is enabled
- base_statement << " AND EXISTS (SELECT 1 AS one FROM #{EnabledModule.table_name} em WHERE em.project_id = #{Project.table_name}.id AND em.name='#{perm.project_module}')"
+ base_statement += " AND EXISTS (SELECT 1 AS one FROM #{EnabledModule.table_name} em WHERE em.project_id = #{Project.table_name}.id AND em.name='#{perm.project_module}')"
end
if project = options[:project]
project_statement = project.project_condition(options[:with_subprojects])
@@ -622,7 +622,7 @@ class Project < ActiveRecord::Base
end
def css_classes
- s = 'project'
+ s = +'project'
s << ' root' if root?
s << ' child' if child?
s << (leaf? ? ' leaf' : ' parent')