From 6c39a260a3c44c1d121a7421b1d6c09358da20a1 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Wed, 1 May 2013 16:43:51 +0000 Subject: [PATCH] Propose system activities only when reassigning time entries (#13783). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11762 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/enumerations_controller.rb | 2 +- app/models/enumeration.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/enumerations_controller.rb b/app/controllers/enumerations_controller.rb index 4e5475bec..125e87cff 100644 --- a/app/controllers/enumerations_controller.rb +++ b/app/controllers/enumerations_controller.rb @@ -77,7 +77,7 @@ class EnumerationsController < ApplicationController return end end - @enumerations = @enumeration.class.all - [@enumeration] + @enumerations = @enumeration.class.system.all - [@enumeration] end private diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb index 1946735ec..7e8bf5a81 100644 --- a/app/models/enumeration.rb +++ b/app/models/enumeration.rb @@ -38,6 +38,7 @@ class Enumeration < ActiveRecord::Base scope :shared, lambda { where(:project_id => nil) } scope :sorted, lambda { order("#{table_name}.position ASC") } scope :active, lambda { where(:active => true) } + scope :system, lambda { where(:project_id => nil) } scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)} def self.default