Changed Enumerations to use a Single Table Inheritance
* Added migrations to change Enumerations to an STI relationship * Added TimeEntryActivity model (STI) * Added DocumentCategory model (STI) * Added IssuePriority model (STI) * Added Enumeration#get_subclasses to get a list of the subclasses of Enumeration * Changed Enumeration to use the STI type field instead of the opt field * Changed Enumeration#opt to return the old opt values but with a deprecation warning. * Removed Enumeration::OPTIONS * Removed the dynamic named_scopes in favor of specific named_scopes. Kept for compatibility reasons. * Added Enumeration#default so each subclass can easily find it's default record. * Fixed Enumeration#default to use the STI scoping with a fake default scope for finding Enumeration's default. * Added a 'all' named scope for getting all records in order by position. * Added Deprecation warnings to the old named_scopes in Enumerations. * Moved various methods off of Enumeration and onto the concrete classes * Changed the EnumerationsController to use types * Updated the Enumeration list template * Added has_many relationships to the Enumeration STI classes. * Fixes for tests. #3007 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2777 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -31,14 +31,19 @@ class EnumerationsController < ApplicationController
|
||||
end
|
||||
|
||||
def new
|
||||
@enumeration = Enumeration.new(:opt => params[:opt])
|
||||
begin
|
||||
@enumeration = params[:type].constantize.new
|
||||
rescue NameError
|
||||
@enumeration = Enumeration.new
|
||||
end
|
||||
end
|
||||
|
||||
def create
|
||||
@enumeration = Enumeration.new(params[:enumeration])
|
||||
@enumeration.type = params[:enumeration][:type]
|
||||
if @enumeration.save
|
||||
flash[:notice] = l(:notice_successful_create)
|
||||
redirect_to :action => 'list', :opt => @enumeration.opt
|
||||
redirect_to :action => 'list', :type => @enumeration.type
|
||||
else
|
||||
render :action => 'new'
|
||||
end
|
||||
@@ -50,9 +55,10 @@ class EnumerationsController < ApplicationController
|
||||
|
||||
def update
|
||||
@enumeration = Enumeration.find(params[:id])
|
||||
@enumeration.type = params[:enumeration][:type] if params[:enumeration][:type]
|
||||
if @enumeration.update_attributes(params[:enumeration])
|
||||
flash[:notice] = l(:notice_successful_update)
|
||||
redirect_to :action => 'list', :opt => @enumeration.opt
|
||||
redirect_to :action => 'list', :type => @enumeration.type
|
||||
else
|
||||
render :action => 'edit'
|
||||
end
|
||||
@@ -65,12 +71,12 @@ class EnumerationsController < ApplicationController
|
||||
@enumeration.destroy
|
||||
redirect_to :action => 'index'
|
||||
elsif params[:reassign_to_id]
|
||||
if reassign_to = Enumeration.find_by_opt_and_id(@enumeration.opt, params[:reassign_to_id])
|
||||
if reassign_to = Enumeration.find_by_type_and_id(@enumeration.type, params[:reassign_to_id])
|
||||
@enumeration.destroy(reassign_to)
|
||||
redirect_to :action => 'index'
|
||||
end
|
||||
end
|
||||
@enumerations = Enumeration.values(@enumeration.opt) - [@enumeration]
|
||||
@enumerations = Enumeration.find(:all, :conditions => ['type = (?)', @enumeration.type]) - [@enumeration]
|
||||
#rescue
|
||||
# flash[:error] = 'Unable to delete enumeration'
|
||||
# redirect_to :action => 'index'
|
||||
|
||||
Reference in New Issue
Block a user