Some smaller refactorings

app/controllers/work_packages/auto_completes_controller.rb

@@ -55,14 +55,14 @@ def index
 
     respond_to do |format|
       format.html do render layout: false end
-      format.any(:xml, :json) { render request.format.to_sym => wp_hashes_with_string }
+      format.any(:xml, :json) { render request.format.to_sym => wp_hashes_with_string(@work_packages) }
     end
   end
 
   private
 
-  def wp_hashes_with_string
-    @work_packages.map do |work_package|
+  def wp_hashes_with_string(work_packages)
+    work_packages.map do |work_package|
       wp_hash = Hash.new
       work_package.attributes.each do |key, value| wp_hash[key] = Rack::Utils.escape_html(value) end
       wp_hash['to_s'] = Rack::Utils.escape_html(work_package.to_s)
@@ -73,9 +73,7 @@ def wp_hashes_with_string
   def find_project
     project_id = (params[:work_package] && params[:work_package][:project_id]) || params[:project_id]
     return nil unless project_id
-    Project.find(project_id)
-  rescue ActiveRecord::RecordNotFound
-    nil
+    Project.find_by_id(project_id)
   end
 
   def determine_scope

app/models/user.rb

@@ -213,21 +213,11 @@ def self.search_in_project(query, options)
   end
 
   def self.register_allowance_evaluator(filter)
-    self.registered_allowance_evaluators ||= []
-
     registered_allowance_evaluators << filter
   end
 
-  # replace by class_attribute when on rails 3.x
-  class_eval do
-    def self.registered_allowance_evaluators() nil end
-    def self.registered_allowance_evaluators=(val)
-      singleton_class.class_eval do
-        define_method(:registered_allowance_evaluators) do
-          val
-        end
-      end
-    end
+  def self.registered_allowance_evaluators
+    @@registered_allowance_evaluators ||= []
   end
 
   register_allowance_evaluator OpenProject::PrincipalAllowanceEvaluator::Default
@@ -627,8 +617,6 @@ def allowed_to?(action, context, options = {})
   end
 
   def allowed_to_in_project?(action, project, options = {})
-    initialize_allowance_evaluators
-
     # No action allowed on archived projects
     return false unless project.active?
     # No action allowed on disabled modules
@@ -637,11 +625,11 @@ def allowed_to_in_project?(action, project, options = {})
     return true if admin?
 
     candidates_for_project_allowance(project).any? do |candidate|
-      denied = @registered_allowance_evaluators.any? do |filter|
+      denied = allowance_evaluators.any? do |filter|
         filter.denied_for_project? candidate, action, project, options
       end
 
-      !denied && @registered_allowance_evaluators.any? do |filter|
+      !denied && allowance_evaluators.any? do |filter|
         filter.granted_for_project? candidate, action, project, options
       end
     end
@@ -653,14 +641,13 @@ def allowed_to_globally?(action, options = {})
     # Admin users are always authorized
     return true if admin?
 
-    initialize_allowance_evaluators
     # authorize if user has at least one membership granting this permission
     candidates_for_global_allowance.any? do |candidate|
-      denied = @registered_allowance_evaluators.any? do |evaluator|
+      denied = allowance_evaluators.any? do |evaluator|
         evaluator.denied_for_global? candidate, action, options
       end
 
-      !denied && @registered_allowance_evaluators.any? do |evaluator|
+      !denied && allowance_evaluators.any? do |evaluator|
         evaluator.granted_for_global? candidate, action, options
       end
     end
@@ -798,18 +785,18 @@ def password_meets_requirements
 
   private
 
-  def initialize_allowance_evaluators
-    @registered_allowance_evaluators ||= self.class.registered_allowance_evaluators.map do |evaluator|
+  def allowance_evaluators
+    @allowance_evaluators ||= self.class.registered_allowance_evaluators.map do |evaluator|
       evaluator.new(self)
     end
   end
 
   def candidates_for_global_allowance
-    @registered_allowance_evaluators.map(&:global_granting_candidates).flatten.uniq
+    allowance_evaluators.map(&:global_granting_candidates).flatten.uniq
   end
 
   def candidates_for_project_allowance(project)
-    @registered_allowance_evaluators.map { |f| f.project_granting_candidates(project) }.flatten.uniq
+    allowance_evaluators.map { |f| f.project_granting_candidates(project) }.flatten.uniq
   end
 
   def former_passwords_include?(password)

app/services/create_work_package_service.rb

@@ -28,11 +28,11 @@
 #++
 
 class CreateWorkPackageService
-  attr_accessor :user, :project, :work_package
+  attr_reader :user, :project
 
   def initialize(user:, project:, send_notifications: true)
-    self.user = user
-    self.project = project
+    @user = user
+    @project = project
 
     JournalManager.send_notification = send_notifications
   end
@@ -43,7 +43,7 @@ def create
       author: user,
       type: project.types.where(is_default: true).first || project.types.first
     }
-    self.work_package = project.add_work_package(hash)
+    project.add_work_package(hash)
   end
 
   def save(work_package)