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:
@@ -2,7 +2,7 @@
|
||||
<div class="box">
|
||||
<!--[form:document]-->
|
||||
<p><label for="document_category_id"><%=l(:field_category)%></label>
|
||||
<%= select('document', 'category_id', Enumeration.document_categories.collect {|c| [c.name, c.id]}) %></p>
|
||||
<%= select('document', 'category_id', DocumentCategory.all.collect {|c| [c.name, c.id]}) %></p>
|
||||
|
||||
<p><label for="document_title"><%=l(:field_title)%> <span class="required">*</span></label>
|
||||
<%= text_field 'document', 'title', :size => 60 %></p>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<%= error_messages_for 'enumeration' %>
|
||||
<div class="box">
|
||||
<!--[form:optvalue]-->
|
||||
<%= hidden_field 'enumeration', 'opt' %>
|
||||
<%= hidden_field 'enumeration', 'type' %>
|
||||
|
||||
<p><label for="enumeration_name"><%=l(:field_name)%></label>
|
||||
<%= text_field 'enumeration', 'name' %></p>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<h2><%=l(:label_enumerations)%></h2>
|
||||
|
||||
<% Enumeration::OPTIONS.each do |option, params| %>
|
||||
<h3><%= l(params[:label]) %></h3>
|
||||
<% Enumeration.get_subclasses.each do |klass| %>
|
||||
<h3><%= l(klass::OptionName) %></h3>
|
||||
|
||||
<% enumerations = Enumeration.values(option) %>
|
||||
<% enumerations = klass.all %>
|
||||
<% if enumerations.any? %>
|
||||
<table class="list">
|
||||
<% enumerations.each do |enumeration| %>
|
||||
@@ -20,7 +20,7 @@
|
||||
<% reset_cycle %>
|
||||
<% end %>
|
||||
|
||||
<p><%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option } %></p>
|
||||
<p><%= link_to l(:label_enumeration_new), { :action => 'new', :type => klass.name } %></p>
|
||||
<% end %>
|
||||
|
||||
<% html_title(l(:label_enumerations)) -%>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
<%= select_tag('status_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_statuses, :id, :name)) %></label>
|
||||
<% end %>
|
||||
<label><%= l(:field_priority) %>:
|
||||
<%= select_tag('priority_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(Enumeration.priorities, :id, :name)) %></label>
|
||||
<%= select_tag('priority_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(IssuePriority.all, :id, :name)) %></label>
|
||||
<label><%= l(:field_category) %>:
|
||||
<%= select_tag('category_id', content_tag('option', l(:label_no_change_option), :value => '') +
|
||||
content_tag('option', l(:label_none), :value => 'none') +
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
:conditions => {:assigned_to_id => User.current.id},
|
||||
:limit => 10,
|
||||
:include => [ :status, :project, :tracker, :priority ],
|
||||
:order => "#{Enumeration.table_name}.position DESC, #{Issue.table_name}.updated_on DESC") %>
|
||||
:order => "#{IssuePriority.table_name}.position DESC, #{Issue.table_name}.updated_on DESC") %>
|
||||
<%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues } %>
|
||||
<% if assigned_issues.length > 0 %>
|
||||
<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues',
|
||||
|
||||
Reference in New Issue
Block a user