jro_apps/redmine Commit - r8069:0471de41ff48

Resourcified enumerations....

Jean-Philippe Lang -

r8069:0471de41ff48

parent child

Context file:

r8069:0471de41ff48

Collapse all files

app/controllers/enumerations_controller.rb +22 -21

               layout 'admin'
               before_filter :require_admin
+              before_filter :build_new_enumeration, :only => [:new, :create]
+              before_filter :find_enumeration, :only => [:edit, :update, :destroy]
               helper :custom_fields
-              include CustomFieldsHelper
               def index
               end
-              verify :method => :post, :only => [ :destroy, :create, :update ],
-                     :redirect_to => { :action => :index }
               def new
-                begin
-                  @enumeration = params[:type].constantize.new
-                rescue NameError
-                  @enumeration = Enumeration.new
-                end
               end
               def create
-                @enumeration = Enumeration.new(params[:enumeration])
+                if request.post? && @enumeration.save
-                @enumeration.type = params[:enumeration][:type]
-                if @enumeration.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'index', :type => @enumeration.type
                 else
               end
               def edit
-                @enumeration = Enumeration.find(params[:id])
               end
               def update
-                @enumeration = Enumeration.find(params[:id])
+                if request.put? && @enumeration.update_attributes(params[:enumeration])
-                @enumeration.type = params[:enumeration][:type] if params[:enumeration][:type]
-                if @enumeration.update_attributes(params[:enumeration])
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'index', :type => @enumeration.type
                 else
                 end
               end
+              verify :method => :delete, :only => :destroy, :render => { :nothing => true, :status => :method_not_allowed }
               def destroy
-                @enumeration = Enumeration.find(params[:id])
                 if !@enumeration.in_use?
                   # No associated objects
                   @enumeration.destroy
                     return
                   end
                 end
-                @enumerations = @enumeration.class.find(:all) - [@enumeration]
+                @enumerations = @enumeration.class.all - [@enumeration]
-              #rescue
+              end
-              #  flash[:error] = 'Unable to delete enumeration'
-              #  redirect_to :action => 'index'
+              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 +4 0

             # 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
               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

app/views/enumerations/_form.html.erb +7 -15

@@ -1,19 +1,11
1	<%= error_messages_for 'enumeration' %>	1	<%= error_messages_for 'enumeration' %>
2	<div class="box">
3	<!--[form:optvalue]-->
4	<%= hidden_field 'enumeration', 'type' %>
5		2
6	<p><label for="enumeration_name"><%=l(:field_name)%></label>	3	<div class="box tabular">
7	<%= text_field ~~'enumeration', 'name'~~ %></p>	4	<p><%= f.text_field :name %></p>
		5	<p><%= f.check_box :active %></p>
		6	<p><%= f.check_box :is_default %></p>
8		7
9	<p><label for="enumeration_active"><%=l(:field_active)%></label>	8	<% @enumeration.custom_field_values.each do \|value\| %>
10	<%= check_box 'enumeration', 'active' %></p>	9	<p><%= custom_field_tag_with_label :enumeration, value %></p>
11		10	<% end %>
12	<p><label for="enumeration_is_default"><%=l(:field_is_default)%></label>
13	<%= check_box 'enumeration', 'is_default' %></p>
14	<!--[eoform:optvalue]-->
15
16	<% @enumeration.custom_field_values.each do \|value\| %>
17	<p><%= custom_field_tag_with_label :enumeration, value %></p>
18	<% end %>
19	</div>	11	</div>

app/views/enumerations/destroy.html.erb +2 -2

             <h2><%= l(@enumeration.option_name) %>: <%=h @enumeration %></h2>
-            <% form_tag({}) do %>
+            <% form_tag({}, :method => :delete) do %>
             <div class="box">
             <p><strong><%= l(:text_enumeration_destroy_question, @enumeration.objects_count) %></strong></p>
             <p><label for='reassign_to_id'><%= l(:text_enumeration_category_reassign_to) %></label>
             </div>
             <%= submit_tag l(:button_apply) %>
-            <%= link_to l(:button_cancel), :controller => 'enumerations', :action => 'index' %>
+            <%= link_to l(:button_cancel), enumerations_path %>
             <% end %>

app/views/enumerations/edit.html.erb +3 -3

-            <h2><%= link_to l(@enumeration.option_name), :controller => 'enumerations', :action => 'index' %> &#187; <%=h @enumeration %></h2>
+            <h2><%= link_to l(@enumeration.option_name), enumerations_path %> &#187; <%=h @enumeration %></h2>
-            <% form_tag({:action => 'update', :id => @enumeration}, :class => "tabular") do %>
+            <% labelled_form_for :enumeration, @enumeration, :url => enumeration_path(@enumeration), :html => {:method => :put} do |f| %>
-              <%= render :partial => 'form' %>
+              <%= render :partial => 'form', :locals => {:f => f} %>
               <%= submit_tag l(:button_save) %>
             <% end %>

app/views/enumerations/index.html.erb +5 -5

             </tr></thead>
             <% enumerations.each do |enumeration| %>
             <tr class="<%= cycle('odd', 'even') %>">
-                <td><%= link_to h(enumeration), :action => 'edit', :id => enumeration %></td>
+                <td><%= link_to h(enumeration), edit_enumeration_path(enumeration) %></td>
                 <td class="center" style="width:15%;"><%= checked_image enumeration.is_default? %></td>
                 <td class="center" style="width:15%;"><%= checked_image enumeration.active? %></td>
-                <td style="width:15%;"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}) %></td>
+                <td style="width:15%;"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}, :put) %></td>
                 <td class="buttons">
-                <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration },
+                <%= link_to l(:button_delete), enumeration_path(enumeration),
-                                               :method => :post,
+                                               :method => :delete,
                                                :confirm => l(:text_are_you_sure),
                                                :class => 'icon icon-del' %>
                 </td>
             <% reset_cycle %>
             <% end %>
-            <p><%= link_to l(:label_enumeration_new), { :action => 'new', :type => klass.name } %></p>
+            <p><%= link_to l(:label_enumeration_new), new_enumeration_path(:type => klass.name) %></p>
             <% end %>
             <% html_title(l(:label_enumerations)) -%>

app/views/enumerations/new.html.erb +4 -3

@@ -1,6 +1,7
1	<h2><%= link_to l(@enumeration.option_name), ~~:controller => '~~enumerations~~', :action => 'index'~~ %> » <%=l(:label_enumeration_new)%></h2>	1	<h2><%= link_to l(@enumeration.option_name), enumerations_path %> » <%=l(:label_enumeration_new)%></h2>
2		2
3	<% form_tag({:action => 'create'}, :class => "tabular") do %>	3	<% labelled_form_for :enumeration, @enumeration, :url => enumerations_path do \|f\| %>
4	<%= render :partial => 'form' %>	4	<%= f.hidden_field :type %>
		5	<%= render :partial => 'form', :locals => {:f => f} %>
5	<%= submit_tag l(:button_create) %>	6	<%= submit_tag l(:button_create) %>
6	<% end %>	7	<% end %>

config/routes.rb +1 -6

               map.resources :issue_statuses, :except => :show, :collection => {:update_issue_done_ratio => :post}
               map.resources :custom_fields, :except => :show
               map.resources :roles, :except => :show, :collection => {:permissions => [:get, :post]}
+              map.resources :enumerations, :except => :show
               map.connect 'search', :controller => 'search', :action => 'index', :conditions => {:method => :get}
               map.connect 'workflows', :controller => 'workflows', :action => 'index', :conditions => {:method => :get}
               map.connect 'workflows/edit', :controller => 'workflows', :action => 'edit', :conditions => {:method => [:get, :post]}
               map.connect 'workflows/copy', :controller => 'workflows', :action => 'copy', :conditions => {:method => [:get, :post]}
-              map.connect 'enumerations', :controller => 'enumerations', :action => 'index', :conditions => {:method => :get}
-              map.connect 'enumerations/new', :controller => 'enumerations', :action => 'new', :conditions => {:method => :get}
-              map.connect 'enumerations/create', :controller => 'enumerations', :action => 'create', :conditions => {:method => :post}
-              map.connect 'enumerations/edit/:id', :controller => 'enumerations', :action => 'edit', :id => /\d+/, :conditions => {:method => :get}
-              map.connect 'enumerations/update/:id', :controller => 'enumerations', :action => 'update', :id => /\d+/, :conditions => {:method => :post}
-              map.connect 'enumerations/destroy/:id', :controller => 'enumerations', :action => 'destroy', :id => /\d+/, :conditions => {:method => :post}
               map.connect 'settings', :controller => 'settings', :action => 'index', :conditions => {:method => :get}
               map.connect 'settings/edit', :controller => 'settings', :action => 'edit', :conditions => {:method => [:get, :post]}
               map.connect 'settings/plugin/:id', :controller => 'settings', :action => 'plugin', :conditions => {:method => [:get, :post]}

test/functional/enumerations_controller_test.rb +14 -5

                 assert_response :success
                 assert_template 'new'
                 assert_kind_of IssuePriority, assigns(:enumeration)
+                assert_tag 'input', :attributes => {:name => 'enumeration[type]', :value => 'IssuePriority'}
+                assert_tag 'input', :attributes => {:name => 'enumeration[name]'}
               end
               def test_create
                 get :edit, :id => 6
                 assert_response :success
                 assert_template 'edit'
+                assert_tag 'input', :attributes => {:name => 'enumeration[name]', :value => 'High'}
               end
               def test_update
                 assert_no_difference 'IssuePriority.count' do
-                  post :update, :id => 6, :enumeration => {:type => 'IssuePriority', :name => 'New name'}
+                  put :update, :id => 6, :enumeration => {:type => 'IssuePriority', :name => 'New name'}
                 end
                 assert_redirected_to '/enumerations?type=IssuePriority'
                 e = IssuePriority.find(6)
               def test_update_with_failure
                 assert_no_difference 'IssuePriority.count' do
-                  post :update, :id => 6, :enumeration => {:type => 'IssuePriority', :name => ''}
+                  put :update, :id => 6, :enumeration => {:type => 'IssuePriority', :name => ''}
                 end
                 assert_response :success
                 assert_template 'edit'
               end
               def test_destroy_enumeration_not_in_use
-                post :destroy, :id => 7
+                assert_difference 'IssuePriority.count', -1 do
+                  delete :destroy, :id => 7
+                end
                 assert_redirected_to :controller => 'enumerations', :action => 'index'
                 assert_nil Enumeration.find_by_id(7)
               end
               def test_destroy_enumeration_in_use
-                post :destroy, :id => 4
+                assert_no_difference 'IssuePriority.count' do
+                  delete :destroy, :id => 4
+                end
                 assert_response :success
                 assert_template 'destroy'
                 assert_not_nil Enumeration.find_by_id(4)
               def test_destroy_enumeration_in_use_with_reassignment
                 issue = Issue.find(:first, :conditions => {:priority_id => 4})
-                post :destroy, :id => 4, :reassign_to_id => 6
+                assert_difference 'IssuePriority.count', -1 do
+                  delete :destroy, :id => 4, :reassign_to_id => 6
+                end
                 assert_redirected_to :controller => 'enumerations', :action => 'index'
                 assert_nil Enumeration.find_by_id(4)
                 # check that the issue was reassign

test/integration/routing_test.rb +9 0

@@ -66,6 +66,15 class RoutingTest < ActionController::IntegrationTest
66		66
67	should_route :post, "/documents/22/add_attachment", :controller => 'documents', :action => 'add_attachment', :id => '22'	67	should_route :post, "/documents/22/add_attachment", :controller => 'documents', :action => 'add_attachment', :id => '22'
68	end	68	end
		69
		70	context "roles" do
		71	should_route :get, "/enumerations", :controller => 'enumerations', :action => 'index'
		72	should_route :get, "/enumerations/new", :controller => 'enumerations', :action => 'new'
		73	should_route :post, "/enumerations", :controller => 'enumerations', :action => 'create'
		74	should_route :get, "/enumerations/2/edit", :controller => 'enumerations', :action => 'edit', :id => 2
		75	should_route :put, "/enumerations/2", :controller => 'enumerations', :action => 'update', :id => 2
		76	should_route :delete, "/enumerations/2", :controller => 'enumerations', :action => 'destroy', :id => 2
		77	end
69		78
70	context "groups" do	79	context "groups" do
71	should_route :post, "/groups/567/users", :controller => 'groups', :action => 'add_users', :id => '567'	80	should_route :post, "/groups/567/users", :controller => 'groups', :action => 'add_users', :id => '567'

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