jro_apps/redmine Commit - r11532:6c39a260a3c4

Propose system activities only when reassigning time entries (#13783)....

Jean-Philippe Lang -

r11532:6c39a260a3c4

parent child

Context file:

r11532:6c39a260a3c4

Collapse all files

app/controllers/enumerations_controller.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class EnumerationsController < ApplicationController
               layout 'admin'
               before_filter :require_admin, :except => :index
               before_filter :require_admin_or_api_request, :only => :index
               before_filter :build_new_enumeration, :only => [:new, :create]
               before_filter :find_enumeration, :only => [:edit, :update, :destroy]
               accept_api_auth :index
               helper :custom_fields
               def index
                 respond_to do |format|
                   format.html
                   format.api {
                     @klass = Enumeration.get_subclass(params[:type])
                     if @klass
                       @enumerations = @klass.shared.sorted.all
                     else
                       render_404
                     end
                   }
                 end
               end
               def new
               end
               def create
                 if request.post? && @enumeration.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to enumerations_path
                 else
                   render :action => 'new'
                 end
               end
               def edit
               end
               def update
                 if request.put? && @enumeration.update_attributes(params[:enumeration])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to enumerations_path
                 else
                   render :action => 'edit'
                 end
               end
               def destroy
                 if !@enumeration.in_use?
                   # No associated objects
                   @enumeration.destroy
                   redirect_to enumerations_path
                   return
                 elsif params[:reassign_to_id]
                   if reassign_to = @enumeration.class.find_by_id(params[:reassign_to_id])
                     @enumeration.destroy(reassign_to)
                     redirect_to enumerations_path
                     return
                   end
                 end
-                @enumerations = @enumeration.class.all - [@enumeration]
+                @enumerations = @enumeration.class.system.all - [@enumeration]
               end
               private
               def build_new_enumeration
                 class_name = params[:enumeration] && params[:enumeration][:type] || params[:type]
                 @enumeration = Enumeration.new_subclass_instance(class_name, params[:enumeration])
                 if @enumeration.nil?
                   render_404
                 end
               end
               def find_enumeration
                 @enumeration = Enumeration.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/models/enumeration.rb +1 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Enumeration < ActiveRecord::Base
               include Redmine::SubclassFactory
               default_scope :order => "#{Enumeration.table_name}.position ASC"
               belongs_to :project
               acts_as_list :scope => 'type = \'#{type}\''
               acts_as_customizable
               acts_as_tree :order => "#{Enumeration.table_name}.position ASC"
               before_destroy :check_integrity
               before_save    :check_default
               attr_protected :type
               validates_presence_of :name
               validates_uniqueness_of :name, :scope => [:type, :project_id]
               validates_length_of :name, :maximum => 30
               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
                 # Creates a fake default scope so Enumeration.default will check
                 # it's type.  STI subclasses will automatically add their own
                 # types to the finder.
                 if self.descends_from_active_record?
                   where(:is_default => true, :type => 'Enumeration').first
                 else
                   # STI classes are
                   where(:is_default => true).first
                 end
               end
               # Overloaded on concrete classes
               def option_name
                 nil
               end
               def check_default
                 if is_default? && is_default_changed?
                   Enumeration.update_all({:is_default => false}, {:type => type})
                 end
               end
               # Overloaded on concrete classes
               def objects_count
               end
               def in_use?
                 self.objects_count != 0
               end
               # Is this enumeration overiding a system level enumeration?
               def is_override?
                 !self.parent.nil?
               end
               alias :destroy_without_reassign :destroy
               # Destroy the enumeration
               # If a enumeration is specified, objects are reassigned
               def destroy(reassign_to = nil)
                 if reassign_to && reassign_to.is_a?(Enumeration)
                   self.transfer_relations(reassign_to)
                 end
                 destroy_without_reassign
               end
               def <=>(enumeration)
                 position <=> enumeration.position
               end
               def to_s; name end
               # Returns the Subclasses of Enumeration.  Each Subclass needs to be
               # required in development mode.
               #
               # Note: subclasses is protected in ActiveRecord
               def self.get_subclasses
                 subclasses
               end
               # Does the +new+ Hash override the previous Enumeration?
               def self.overridding_change?(new, previous)
                 if (same_active_state?(new['active'], previous.active)) && same_custom_values?(new,previous)
                   return false
                 else
                   return true
                 end
               end
               # Does the +new+ Hash have the same custom values as the previous Enumeration?
               def self.same_custom_values?(new, previous)
                 previous.custom_field_values.each do |custom_value|
                   if custom_value.value != new["custom_field_values"][custom_value.custom_field_id.to_s]
                     return false
                   end
                 end
                 return true
               end
               # Are the new and previous fields equal?
               def self.same_active_state?(new, previous)
                 new = (new == "1" ? true : false)
                 return new == previous
               end
             private
               def check_integrity
                 raise "Can't delete enumeration" if self.in_use?
               end
             end
             # Force load the subclasses in development mode
             require_dependency 'time_entry_activity'
             require_dependency 'document_category'
             require_dependency 'issue_priority'

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages