jro_apps/redmine Commit - r7761:6f4fb8b8920c

Resourcified issue categories (#9553)....

Jean-Philippe Lang -

r7761:6f4fb8b8920c

parent child

Context file:

r7761:6f4fb8b8920c

Collapse all files

app/controllers/issue_categories_controller.rb +33 -25

@@ -18,47 +18,55
18	class IssueCategoriesController < ApplicationController	18	class IssueCategoriesController < ApplicationController
19	menu_item :settings	19	menu_item :settings
20	model_object IssueCategory	20	model_object IssueCategory
21	before_filter :find_model_object, :except => :new	21	before_filter :find_model_object, :except => [:new, :create]
22	before_filter :find_project_from_association, :except => :new	22	before_filter :find_project_from_association, :except => [:new, :create]
23	before_filter :find_project, :only => :new	23	before_filter :find_project, :only => [:new, :create]
24	before_filter :authorize	24	before_filter :authorize
25		25
26	verify :method => :post, :only => :destroy
27
28	def new	26	def new
29	@category = @project.issue_categories.build(params[:category])	27	@category = @project.issue_categories.build(params[:category])
30	if request.post?	28	end
31	if @category.save	29
32	respond_to do \|format\|	30	verify :method => :post, :only => :create
33	format.html do	31	def create
34	flash[:notice] = l(:notice_successful_create)	32	@category = @project.issue_categories.build(params[:category])
35	redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project	33	if @category.save
36	end	34	respond_to do \|format\|
37	format.js do	35	format.html do
38	# IE doesn't support the replace_html rjs method for select box options	36	flash[:notice] = l(:notice_successful_create)
39	render(:update) {\|page\| page.replace "issue_category_id",	37	redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
40	content_tag('select', '<option></option>' + options_from_collection_for_select(@project.issue_categories, 'id', 'name', @category.id), :id => 'issue_category_id', :name => 'issue[category_id]')
41	}
42	end
43	end	38	end
44	else	39	format.js do
45	respond_to do \|format\|	40	# IE doesn't support the replace_html rjs method for select box options
46	format.html	41	render(:update) {\|page\| page.replace "issue_category_id",
47	format.js do	42	content_tag('select', '<option></option>' + options_from_collection_for_select(@project.issue_categories, 'id', 'name', @category.id), :id => 'issue_category_id', :name => 'issue[category_id]')
48	render(:update) {\|page\| page.alert(@category.errors.full_messages.join('\n')) }	43	}
49	end	44	end
		45	end
		46	else
		47	respond_to do \|format\|
		48	format.html { render :action => 'new'}
		49	format.js do
		50	render(:update) {\|page\| page.alert(@category.errors.full_messages.join('\n')) }
50	end	51	end
51	end	52	end
52	end	53	end
53	end	54	end
54		55
55	def edit	56	def edit
56	if request.post? and @category.update_attributes(params[:category])	57	end
		58
		59	verify :method => :put, :only => :update
		60	def update
		61	if @category.update_attributes(params[:category])
57	flash[:notice] = l(:notice_successful_update)	62	flash[:notice] = l(:notice_successful_update)
58	redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project	63	redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
		64	else
		65	render :action => 'edit'
59	end	66	end
60	end	67	end
61		68
		69	verify :method => :delete, :only => :destroy
62	def destroy	70	def destroy
63	@issue_count = @category.issues.size	71	@issue_count = @category.issues.size
64	if @issue_count == 0	72	if @issue_count == 0

app/views/issue_categories/destroy.html.erb +1 -1

             <h2><%=l(:label_issue_category)%>: <%=h @category.name %></h2>
-            <% form_tag({}) do %>
+            <% form_tag(issue_category_path(@category), :method => :delete) do %>
             <div class="box">
             <p><strong><%= l(:text_issue_category_destroy_question, @issue_count) %></strong></p>
             <p><label><%= radio_button_tag 'todo', 'nullify', true %> <%= l(:text_issue_category_destroy_assignments) %></label><br />

app/views/issue_categories/edit.html.erb +1 -1

             <h2><%=l(:label_issue_category)%></h2>
-            <% labelled_tabular_form_for :category, @category, :url => { :action => 'edit', :id => @category } do |f| %>
+            <% labelled_tabular_form_for :category, @category, :url => issue_category_path(@category), :html => {:method => :put} do |f| %>
             <%= render :partial => 'issue_categories/form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
             <% end %>

app/views/issue_categories/new.html.erb +1 -1

             <h2><%=l(:label_issue_category_new)%></h2>
-            <% labelled_tabular_form_for :category, @category, :url => { :action => 'new' } do |f| %>
+            <% labelled_tabular_form_for :category, @category, :url => project_issue_categories_path(@project) do |f| %>
             <%= render :partial => 'issue_categories/form', :locals => { :f => f } %>
             <%= submit_tag l(:button_create) %>
             <% end %>

app/views/issues/_attributes.html.erb +1 -1

             <%= prompt_to_remote(image_tag('add.png', :style => 'vertical-align: middle;'),
                                  l(:label_issue_category_new),
                                  'category[name]',
-                                 {:controller => 'issue_categories', :action => 'new', :project_id => @project},
+                                 {:controller => 'issue_categories', :action => 'create', :project_id => @project},
                                  :title => l(:label_issue_category_new),
                                  :tabindex => 199) if authorize_for('issue_categories', 'new') %></p>
             <% end %>

app/views/projects/settings/_issue_categories.html.erb +5 -3

                 <td><%=h(category.name) %></td>
                 <td><%=h(category.assigned_to.name) if category.assigned_to %></td>
                 <td class="buttons">
-                  <%= link_to_if_authorized l(:button_edit), { :controller => 'issue_categories', :action => 'edit', :id => category }, :class => 'icon icon-edit' %>
+                	<% if User.current.allowed_to?(:manage_categories, @project) %>
-                  <%= link_to_if_authorized l(:button_delete), {:controller => 'issue_categories', :action => 'destroy', :id => category}, :method => :post, :class => 'icon icon-del' %>
+                    <%= link_to l(:button_edit), edit_issue_category_path(category), :class => 'icon icon-edit' %>
+                    <%= link_to l(:button_delete), issue_category_path(category), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
+            		  <% end %>
                 </td>
               </tr>
               <% end %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>
-            <p><%= link_to_if_authorized l(:label_issue_category_new), :controller => 'issue_categories', :action => 'new', :project_id => @project %></p>
+            <p><%= link_to l(:label_issue_category_new), new_project_issue_category_path(@project) if User.current.allowed_to?(:manage_categories, @project) %></p>

config/routes.rb +1 -4

                 project.resources :news, :shallow => true
                 project.resources :time_entries, :controller => 'timelog', :path_prefix => 'projects/:project_id'
                 project.resources :queries, :only => [:new, :create]
+                project.resources :issue_categories, :shallow => true
                 project.wiki_start_page 'wiki', :controller => 'wiki', :action => 'show', :conditions => {:method => :get}
                 project.wiki_index 'wiki/index', :controller => 'wiki', :action => 'index', :conditions => {:method => :get}
                 activity.connect 'activity.:format', :id => nil
               end
-              map.with_options :controller => 'issue_categories' do |categories|
-                categories.connect 'projects/:project_id/issue_categories/new', :action => 'new'
-              end
               map.with_options :controller => 'repositories' do |repositories|
                 repositories.with_options :conditions => {:method => :get} do |repository_views|
                   repository_views.connect 'projects/:id/repository', :action => 'show'

lib/redmine.rb +1 -1

               map.project_module :issue_tracking do |map|
                 # Issue categories
-                map.permission :manage_categories, {:projects => :settings, :issue_categories => [:new, :edit, :destroy]}, :require => :member
+                map.permission :manage_categories, {:projects => :settings, :issue_categories => [:new, :create, :edit, :update, :destroy]}, :require => :member
                 # Issues
                 map.permission :view_issues, {:issues => [:index, :show],
                                               :auto_complete => [:issues],

test/functional/issue_categories_controller_test.rb +31 -11

                 @request.session[:user_id] = 2
               end
-              def test_get_new
+              def test_new
                 @request.session[:user_id] = 2 # manager
                 get :new, :project_id => '1'
                 assert_response :success
                 assert_template 'new'
               end
-              def test_post_new
+              def test_create
                 @request.session[:user_id] = 2 # manager
                 assert_difference 'IssueCategory.count' do
-                  post :new, :project_id => '1', :category => {:name => 'New category'}
+                  post :create, :project_id => '1', :category => {:name => 'New category'}
                 end
                 assert_redirected_to '/projects/ecookbook/settings/categories'
                 category = IssueCategory.find_by_name('New category')
                 assert_equal 1, category.project_id
               end
-              def test_post_edit
+              def test_create_failure
+                @request.session[:user_id] = 2
+                post :create, :project_id => '1', :category => {:name => ''}
+                assert_response :success
+                assert_template 'new'
+              end
+              def test_edit
+                @request.session[:user_id] = 2
+                get :edit, :id => 2
+                assert_response :success
+                assert_template 'edit'
+              end
+              def test_update
                 assert_no_difference 'IssueCategory.count' do
-                  post :edit, :id => 2, :category => { :name => 'Testing' }
+                  put :update, :id => 2, :category => { :name => 'Testing' }
                 end
                 assert_redirected_to '/projects/ecookbook/settings/categories'
                 assert_equal 'Testing', IssueCategory.find(2).name
               end
-              def test_edit_not_found
+              def test_update_failure
-                post :edit, :id => 97, :category => { :name => 'Testing' }
+                put :update, :id => 2, :category => { :name => '' }
+                assert_response :success
+                assert_template 'edit'
+              end
+              def test_update_not_found
+                put :update, :id => 97, :category => { :name => 'Testing' }
                 assert_response 404
               end
               def test_destroy_category_not_in_use
-                post :destroy, :id => 2
+                delete :destroy, :id => 2
                 assert_redirected_to '/projects/ecookbook/settings/categories'
                 assert_nil IssueCategory.find_by_id(2)
               end
               def test_destroy_category_in_use
-                post :destroy, :id => 1
+                delete :destroy, :id => 1
                 assert_response :success
                 assert_template 'destroy'
                 assert_not_nil IssueCategory.find_by_id(1)
               def test_destroy_category_in_use_with_reassignment
                 issue = Issue.find(:first, :conditions => {:category_id => 1})
-                post :destroy, :id => 1, :todo => 'reassign', :reassign_to_id => 2
+                delete :destroy, :id => 1, :todo => 'reassign', :reassign_to_id => 2
                 assert_redirected_to '/projects/ecookbook/settings/categories'
                 assert_nil IssueCategory.find_by_id(1)
                 # check that the issue was reassign
               def test_destroy_category_in_use_without_reassignment
                 issue = Issue.find(:first, :conditions => {:category_id => 1})
-                post :destroy, :id => 1, :todo => 'nullify'
+                delete :destroy, :id => 1, :todo => 'nullify'
                 assert_redirected_to '/projects/ecookbook/settings/categories'
                 assert_nil IssueCategory.find_by_id(1)
                 # check that the issue category was nullified

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