jro_apps/redmine Commit - r722:fa969504d452

A category with assigned issue can now be deleted. 2 options are proposed:...

Jean-Philippe Lang -

r722:fa969504d452

parent child

Context file:

r722:fa969504d452

Collapse all files

app/views/issue_categories/destroy.rhtml created 644 +15 0

@@ -0,0 +1,15
	1	<h2><%=l(:label_issue_category)%>: <%=h @category.name %></h2>
	2
	3	<% form_tag({}) do %>
	4	<div class="box">
	5	<p><strong><%= l(:text_issue_category_destroy_question, @issue_count) %></strong></p>
	6	<p><%= radio_button_tag 'todo', 'nullify', true %> <%= l(:text_issue_category_destroy_assignments) %><br />
	7	<% if @categories.size > 0 %>
	8	<%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_issue_category_reassign_to) %>:
	9	<%= select_tag 'reassign_to_id', options_from_collection_for_select(@categories, 'id', 'name') %></p>
	10	<% end %>
	11	</div>
	12
	13	<%= submit_tag l(:button_apply) %>
	14	<%= link_to l(:button_cancel), :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories' %>
	15	<% end %>

test/unit/issue_category_test.rb created 644 +41 0

@@ -0,0 +1,41
	1	# redMine - project management software
	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	14	# You should have received a copy of the GNU General Public License
	15	# along with this program; if not, write to the Free Software
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../test_helper'
	19
	20	class IssueCategoryTest < Test::Unit::TestCase
	21	fixtures :issue_categories, :issues
	22
	23	def setup
	24	@category = IssueCategory.find(1)
	25	end
	26
	27	def test_destroy
	28	issue = @category.issues.first
	29	@category.destroy
	30	# Make sure the category was nullified on the issue
	31	assert_nil issue.reload.category
	32	end
	33
	34	def test_destroy_with_reassign
	35	issue = @category.issues.first
	36	reassign_to = IssueCategory.find(2)
	37	@category.destroy(reassign_to)
	38	# Make sure the issue was reassigned
	39	assert_equal reassign_to, issue.reload.category
	40	end
	41	end

app/controllers/issue_categories_controller.rb +13 -5

             class IssueCategoriesController < ApplicationController
               layout 'base'
               before_filter :find_project, :authorize
+              verify :method => :post, :only => :destroy
               def edit
                 if request.post? and @category.update_attributes(params[:category])
               end
               def destroy
-                @category.destroy
+                @issue_count = @category.issues.size
-                redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
+                if @issue_count == 0
-              rescue
+                  # No issue assigned to this category
-                flash[:error] = "Categorie can't be deleted"
+                  @category.destroy
-                redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
+                  redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories'
+                elsif params[:todo]
+                  reassign_to = @project.issue_categories.find_by_id(params[:reassign_to_id]) if params[:todo] == 'reassign'
+                  @category.destroy(reassign_to)
+                  redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories'
+                end
+                @categories = @project.issue_categories - [@category]
               end
             private

app/models/issue_category.rb +11 -5

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class IssueCategory < ActiveRecord::Base
-              before_destroy :check_integrity
               belongs_to :project
               belongs_to :assigned_to, :class_name => 'User', :foreign_key => 'assigned_to_id'
+              has_many :issues, :foreign_key => 'category_id', :dependent => :nullify
               validates_presence_of :name
               validates_uniqueness_of :name, :scope => [:project_id]
-            private
+              alias :destroy_without_reassign :destroy
-              def check_integrity
-                raise "Can't delete category" if Issue.find(:first, :conditions => ["category_id=?", self.id])
+              # Destroy the category
+              # If a category is specified, issues are reassigned to this category
+              def destroy(reassign_to = nil)
+                if reassign_to && reassign_to.is_a?(IssueCategory) && reassign_to.project == self.project
+                  Issue.update_all("category_id = #{reassign_to.id}", "category_id = #{id}")
+                end
+                destroy_without_reassign
               end
             end

app/views/projects/settings/_issue_categories.rhtml +1 -1

                 <td><%=h(category.name) %></td>
                 <td><%=h(category.assigned_to.name) if category.assigned_to %></td>
                 <td align="center"><small><%= link_to_if_authorized l(:button_edit), { :controller => 'issue_categories', :action => 'edit', :id => category }, :class => 'icon icon-edit' %></small></td>
-                <td align="center"><small><%= link_to_if_authorized l(:button_delete), {:controller => 'issue_categories', :action => 'destroy', :id => category}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></small></td>
+                <td align="center"><small><%= link_to_if_authorized l(:button_delete), {:controller => 'issue_categories', :action => 'destroy', :id => category}, :method => :post, :class => 'icon icon-del' %></small></td>
             	</tr>
             	<% end %>
             <% end %>

lang/bg.yml +3 0

             text_issue_added: Публикувана е нова задача с номер %s.
             text_issue_updated: Задача %s е обновена.
             text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
+            text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
+            text_issue_category_destroy_assignments: Remove category assignments
+            text_issue_category_reassign_to: Reassing issues to this category
             default_role_manager: Мениджър
             default_role_developper: Разработчик

lang/de.yml +3 0

             text_issue_added: Ticket %s wurde erstellt.
             text_issue_updated: Ticket %s wurde aktualisiert.
             text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
+            text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
+            text_issue_category_destroy_assignments: Remove category assignments
+            text_issue_category_reassign_to: Reassing issues to this category
             default_role_manager: Manager
             default_role_developper: Developer

lang/en.yml +3 0

             text_issue_added: Issue %s has been reported.
             text_issue_updated: Issue %s has been updated.
             text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
+            text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
+            text_issue_category_destroy_assignments: Remove category assignments
+            text_issue_category_reassign_to: Reassing issues to this category
             default_role_manager: Manager
             default_role_developper: Developer

lang/es.yml +3 0

             text_issue_added: Issue %s has been reported.
             text_issue_updated: Issue %s has been updated.
             text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
+            text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
+            text_issue_category_destroy_assignments: Remove category assignments
+            text_issue_category_reassign_to: Reassing issues to this category
             default_role_manager: Manager
             default_role_developper: Desarrollador

lang/fr.yml +3 0

             text_issue_added: La demande %s a été soumise.
             text_issue_updated: La demande %s a été mise à jour.
             text_wiki_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce wiki et tout son contenu ?
+            text_issue_category_destroy_question: Des demandes (%d) sont affectées à cette catégories. Que voulez-vous faire ?
+            text_issue_category_destroy_assignments: N'affecter les demandes à aucune autre catégorie
+            text_issue_category_reassign_to: Réaffecter les demandes à cette catégorie
             default_role_manager: Manager
             default_role_developper: Développeur

lang/it.yml +3 0

             text_issue_added: "E' stata segnalata l'anomalia %s."
             text_issue_updated: "L'anomalia %s e' stata aggiornata."
             text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
+            text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
+            text_issue_category_destroy_assignments: Remove category assignments
+            text_issue_category_reassign_to: Reassing issues to this category
             default_role_manager: Manager
             default_role_developper: Sviluppatore

lang/ja.yml +3 0

             text_issue_added: 問題 %s が報告されました。
             text_issue_updated: 問題 %s が更新されました。
             text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
+            text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
+            text_issue_category_destroy_assignments: Remove category assignments
+            text_issue_category_reassign_to: Reassing issues to this category
             default_role_manager: 管理者
             default_role_developper: 開発者

lang/nl.yml +3 0

             text_issue_added: Issue %s is gerapporteerd.
             text_issue_updated: Issue %s is gewijzigd.
             text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
+            text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
+            text_issue_category_destroy_assignments: Remove category assignments
+            text_issue_category_reassign_to: Reassing issues to this category
             default_role_manager: Manager
             default_role_developper: Ontwikkelaar

lang/pt-br.yml +3 0

             text_issue_added: Tarefa %s foi incluída.
             text_issue_updated: Tarefa %s foi alterada.
             text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
+            text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
+            text_issue_category_destroy_assignments: Remove category assignments
+            text_issue_category_reassign_to: Reassing issues to this category
             default_role_manager: Analista de Negocio ou Gerente de Projeto
             default_role_developper: Desenvolvedor

lang/pt.yml +3 0

             text_issue_added: Tarefa %s foi incluída.
             text_issue_updated: Tarefa %s foi alterada.
             text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
+            text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
+            text_issue_category_destroy_assignments: Remove category assignments
+            text_issue_category_reassign_to: Reassing issues to this category
             default_role_manager: Analista de Negócio ou Gerente de Projeto
             default_role_developper: Desenvolvedor

lang/sv.yml +3 0

             text_issue_added: Brist %s har rapporterats.
             text_issue_updated: Brist %s har uppdaterats.
             text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
+            text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
+            text_issue_category_destroy_assignments: Remove category assignments
+            text_issue_category_reassign_to: Reassing issues to this category
             default_role_manager: Förvaltare
             default_role_developper: Utvecklare

lang/zh.yml +3 0

             text_issue_added: %s ѱ
             text_issue_updated: %s Ѹ
             text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
+            text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
+            text_issue_category_destroy_assignments: Remove category assignments
+            text_issue_category_reassign_to: Reassing issues to this category
             default_role_manager: 管理员
             default_role_developper: 开发人员

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