jro_apps/redmine Commit - r1544:3c95f761e610

0

app/views/enumerations/destroy.rhtml created 644 +12 0

@@ -0,0 +1,12
	1	<h2><%= l(@enumeration.option_name) %>: <%=h @enumeration %></h2>
	2
	3	<% form_tag({}) do %>
	4	<div class="box">
	5	<p><strong><%= l(:text_enumeration_destroy_question, @enumeration.objects_count) %></strong></p>
	6	<p><%= l(:text_enumeration_category_reassign_to) %>
	7	<%= select_tag 'reassign_to_id', ("<option>--- #{l(:actionview_instancetag_blank_option)} ---</option>" + options_from_collection_for_select(@enumerations, 'id', 'name')) %></p>
	8	</div>
	9
	10	<%= submit_tag l(:button_apply) %>
	11	<%= link_to l(:button_cancel), :controller => 'enumerations', :action => 'index' %>
	12	<% end %>

0

test/functional/enumerations_controller.rb created 644 +61 0

@@ -0,0 +1,61
	1	# redMine - project management software
	2	# Copyright (C) 2006-2008 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	require 'enumerations_controller'
	20
	21	# Re-raise errors caught by the controller.
	22	class EnumerationsController; def rescue_action(e) raise e end; end
	23
	24	class EnumerationsControllerTest < Test::Unit::TestCase
	25	fixtures :enumerations, :issues, :users
	26
	27	def setup
	28	@controller = EnumerationsController.new
	29	@request = ActionController::TestRequest.new
	30	@response = ActionController::TestResponse.new
	31	@request.session[:user_id] = 1 # admin
	32	end
	33
	34	def test_index
	35	get :index
	36	assert_response :success
	37	assert_template 'list'
	38	end
	39
	40	def test_destroy_enumeration_not_in_use
	41	post :destroy, :id => 7
	42	assert_redirected_to :controller => 'enumerations', :action => 'index'
	43	assert_nil Enumeration.find_by_id(7)
	44	end
	45
	46	def test_destroy_enumeration_in_use
	47	post :destroy, :id => 4
	48	assert_response :success
	49	assert_template 'destroy'
	50	assert_not_nil Enumeration.find_by_id(4)
	51	end
	52
	53	def test_destroy_enumeration_in_use_with_reassignment
	54	issue = Issue.find(:first, :conditions => {:priority_id => 4})
	55	post :destroy, :id => 4, :reassign_to_id => 6
	56	assert_redirected_to :controller => 'enumerations', :action => 'index'
	57	assert_nil Enumeration.find_by_id(4)
	58	# check that the issue was reassign
	59	assert_equal 6, issue.reload.priority_id
	60	end
	61	end

0

test/unit/enumeration_test.rb created 644 +45 0

@@ -0,0 +1,45
	1	# redMine - project management software
	2	# Copyright (C) 2006-2008 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 EnumerationTest < Test::Unit::TestCase
	21	fixtures :enumerations, :issues
	22
	23	def setup
	24	end
	25
	26	def test_objects_count
	27	# low priority
	28	assert_equal 5, Enumeration.find(4).objects_count
	29	# urgent
	30	assert_equal 0, Enumeration.find(7).objects_count
	31	end
	32
	33	def test_in_use
	34	# low priority
	35	assert Enumeration.find(4).in_use?
	36	# urgent
	37	assert !Enumeration.find(7).in_use?
	38	end
	39
	40	def test_destroy_with_reassign
	41	Enumeration.find(4).destroy(Enumeration.find(6))
	42	assert_nil Issue.find(:first, :conditions => {:priority_id => 4})
	43	assert_equal 5, Enumeration.find(6).objects_count
	44	end
	45	end

0

app/controllers/enumerations_controller.rb +15 -6

@@ -75,11 +75,20 class EnumerationsController < ApplicationController
75	end	75	end
76		76
77	def destroy	77	def destroy
78	Enumeration.find(params[:id]).~~destroy~~	78	@enumeration = Enumeration.find(params[:id])
79	flash[:notice] = l(:notice_successful_delete)	79	if !@enumeration.in_use?
80	redirect_to :action => 'list'	80	# No associated objects
81	rescue	81	@enumeration.destroy
82	flash[:error] = "Unable to delete enumeration"	82	redirect_to :action => 'index'
83	redirect_to :action => 'list'	83	elsif params[:reassign_to_id]
		84	if reassign_to = Enumeration.find_by_opt_and_id(@enumeration.opt, params[:reassign_to_id])
		85	@enumeration.destroy(reassign_to)
		86	redirect_to :action => 'index'
		87	end
		88	end
		89	@enumerations = Enumeration.get_values(@enumeration.opt) - [@enumeration]
		90	#rescue
		91	# flash[:error] = 'Unable to delete enumeration'
		92	# redirect_to :action => 'index'
84	end	93	end
85	end	94	end

0

app/models/enumeration.rb +25 -12

               validates_uniqueness_of :name, :scope => [:opt]
               validates_length_of :name, :maximum => 30
+              # Single table inheritance would be an option
               OPTIONS = {
-                "IPRI" => :enumeration_issue_priorities,
+                "IPRI" => {:label => :enumeration_issue_priorities, :model => Issue, :foreign_key => :priority_id},
-                "DCAT" => :enumeration_doc_categories,
+                "DCAT" => {:label => :enumeration_doc_categories, :model => Document, :foreign_key => :category_id},
-                "ACTI" => :enumeration_activities
+                "ACTI" => {:label => :enumeration_activities, :model => TimeEntry, :foreign_key => :activity_id}
               }.freeze
               def self.get_values(option)
               end
               def option_name
-                OPTIONS[self.opt]
+                OPTIONS[self.opt][:label]
               end
               def before_save
                 Enumeration.update_all("is_default = #{connection.quoted_false}", {:opt => opt}) if is_default?
               end
+              def objects_count
+                OPTIONS[self.opt][:model].count(:conditions => "#{OPTIONS[self.opt][:foreign_key]} = #{id}")
+              end
+              def in_use?
+                self.objects_count != 0
+              end
+              alias :destroy_without_reassign :destroy
+              # Destroy the enumeration
+              # If a enumeration is specified, objects are reassigned
+              def destroy(reassign_to = nil)
+                if reassign_to && reassign_to.is_a?(Enumeration)
+                  OPTIONS[self.opt][:model].update_all("#{OPTIONS[self.opt][:foreign_key]} = #{reassign_to.id}", "#{OPTIONS[self.opt][:foreign_key]} = #{id}")
+                end
+                destroy_without_reassign
+              end
               def <=>(enumeration)
                 position <=> enumeration.position
               end
             private
               def check_integrity
-                case self.opt
+                raise "Can't delete enumeration" if self.in_use?
-                when "IPRI"
-                  raise "Can't delete enumeration" if Issue.find(:first, :conditions => ["priority_id=?", self.id])
-                when "DCAT"
-                  raise "Can't delete enumeration" if Document.find(:first, :conditions => ["category_id=?", self.id])
-                when "ACTI"
-                  raise "Can't delete enumeration" if TimeEntry.find(:first, :conditions => ["activity_id=?", self.id])
-                end
               end
             end

0

app/views/enumerations/list.rhtml +5 -2

             <h2><%=l(:label_enumerations)%></h2>
-            <% Enumeration::OPTIONS.each do |option, name| %>
+            <% Enumeration::OPTIONS.each do |option, params| %>
-            <h3><%= l(name) %></h3>
+            <h3><%= l(params[:label]) %></h3>
             <% enumerations = Enumeration.get_values(option) %>
             <% if enumerations.any? %>
                 <%= link_to image_tag('1downarrow.png', :alt => l(:label_sort_lower)), {:action => 'move', :id => enumeration, :position => 'lower'}, :method => :post, :title => l(:label_sort_lower) %>
                 <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:action => 'move', :id => enumeration, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %>
                 </td>
+                <td align="center" style="width:10%;">
+                <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration }, :method => :post, :confirm => l(:text_are_you_sure), :class => "icon icon-del" %>
+                </td>
             </tr>
             <% end %>
             </table>

0

lang/bg.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/cs.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/da.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/de.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/en.yml +2 0

             text_assign_time_entries_to_project: Assign reported hours to the project
             text_reassign_time_entries: 'Reassign reported hours to this issue:'
             text_user_wrote: '%s wrote:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
             default_role_manager: Manager
             default_role_developper: Developer

0

lang/es.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/fi.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/fr.yml +2 0

             text_assign_time_entries_to_project: Reporter les heures sur le projet
             text_reassign_time_entries: 'Reporter les heures sur cette demande:'
             text_user_wrote: '%s a écrit:'
+            text_enumeration_destroy_question: 'Cette valeur est affectée à %d objets.'
+            text_enumeration_category_reassign_to: 'Réaffecter les objets à cette valeur:'
             default_role_manager: Manager
             default_role_developper: Développeur

0

lang/he.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/hu.yml +2 0

             text_user_wrote: '%s írta:'
             label_duplicated_by: duplikálta
             setting_enabled_scm: Forráskódkezelő (SCM) engedélyezése
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/it.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/ja.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/ko.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/lt.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/nl.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/no.yml +2 0

             enumeration_issue_priorities: Sakssprioriteringer
             enumeration_doc_categories: Dokument-kategorier
             enumeration_activities: Aktiviteter (tidssporing)
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/pl.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/pt-br.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/pt.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/ro.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/ru.yml +2 0

             text_user_wrote: '%s написал:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/sr.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/sv.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/th.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/uk.yml +2 0

             text_user_wrote: '%s wrote:'
             label_duplicated_by: duplicated by
             setting_enabled_scm: Enabled SCM
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/zh-tw.yml +2 0

             enumeration_issue_priorities: 項目優先權
             enumeration_doc_categories: 文件分類
             enumeration_activities: 活動 (時間追蹤)
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

0

lang/zh.yml +2 0

             enumeration_issue_priorities: 问题优先级
             enumeration_doc_categories: 文档类别
             enumeration_activities: 活动（时间跟踪）
+            text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_enumeration_destroy_question: '%d objects are assigned to this value.'

	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