Revision 1182
Added by Jean-Philippe Lang over 17 years ago
Let the user choose when deleting issues with reported hours (closes #734, #71):
- to delete the hours
- to assign the hours to the project
- to reassign the hours to another issue
| trunk/app/controllers/issues_controller.rb | ||
|---|---|---|
| 263 | 263 |
end |
| 264 | 264 |
|
| 265 | 265 |
def destroy |
| 266 |
@hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f |
|
| 267 |
if @hours > 0 |
|
| 268 |
case params[:todo] |
|
| 269 |
when 'destroy' |
|
| 270 |
# nothing to do |
|
| 271 |
when 'nullify' |
|
| 272 |
TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
|
|
| 273 |
when 'reassign' |
|
| 274 |
reassign_to = @project.issues.find_by_id(params[:reassign_to_id]) |
|
| 275 |
if reassign_to.nil? |
|
| 276 |
flash.now[:error] = l(:error_issue_not_found_in_project) |
|
| 277 |
return |
|
| 278 |
else |
|
| 279 |
TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
|
|
| 280 |
end |
|
| 281 |
else |
|
| 282 |
# display the destroy form |
|
| 283 |
return |
|
| 284 |
end |
|
| 285 |
end |
|
| 266 | 286 |
@issues.each(&:destroy) |
| 267 | 287 |
redirect_to :action => 'index', :project_id => @project |
| 268 | 288 |
end |
| trunk/app/models/issue.rb | ||
|---|---|---|
| 27 | 27 | |
| 28 | 28 |
has_many :journals, :as => :journalized, :dependent => :destroy |
| 29 | 29 |
has_many :attachments, :as => :container, :dependent => :destroy |
| 30 |
has_many :time_entries, :dependent => :nullify
|
|
| 30 |
has_many :time_entries, :dependent => :delete_all
|
|
| 31 | 31 |
has_many :custom_values, :dependent => :delete_all, :as => :customized |
| 32 | 32 |
has_many :custom_fields, :through => :custom_values |
| 33 | 33 |
has_and_belongs_to_many :changesets, :order => "revision ASC" |
| trunk/app/views/issue_categories/destroy.rhtml | ||
|---|---|---|
| 3 | 3 |
<% form_tag({}) do %>
|
| 4 | 4 |
<div class="box"> |
| 5 | 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 />
|
|
| 6 |
<p><label><%= radio_button_tag 'todo', 'nullify', true %> <%= l(:text_issue_category_destroy_assignments) %></label><br />
|
|
| 7 | 7 |
<% if @categories.size > 0 %> |
| 8 |
<%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_issue_category_reassign_to) %>:
|
|
| 8 |
<label><%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_issue_category_reassign_to) %></label>:
|
|
| 9 | 9 |
<%= select_tag 'reassign_to_id', options_from_collection_for_select(@categories, 'id', 'name') %></p> |
| 10 | 10 |
<% end %> |
| 11 | 11 |
</div> |
| trunk/app/views/issues/destroy.rhtml | ||
|---|---|---|
| 1 |
<h2><%= l(:confirmation) %></h2> |
|
| 2 | ||
| 3 |
<% form_tag do %> |
|
| 4 |
<%= @issues.collect {|i| hidden_field_tag 'ids[]', i.id } %>
|
|
| 5 |
<div class="box"> |
|
| 6 |
<p><strong><%= l(:text_destroy_time_entries_question, @hours) %></strong></p> |
|
| 7 |
<p> |
|
| 8 |
<label><%= radio_button_tag 'todo', 'destroy', true %> <%= l(:text_destroy_time_entries) %></label><br /> |
|
| 9 |
<label><%= radio_button_tag 'todo', 'nullify', false %> <%= l(:text_assign_time_entries_to_project) %></label><br /> |
|
| 10 |
<label><%= radio_button_tag 'todo', 'reassign', false, :onchange => 'if (this.checked) { $("reassign_to_id").focus(); }' %> <%= l(:text_reassign_time_entries) %></label>
|
|
| 11 |
<%= text_field_tag 'reassign_to_id', params[:reassign_to_id], :size => 6, :onfocus => '$("todo_reassign").checked=true;' %>
|
|
| 12 |
</p> |
|
| 13 |
</div> |
|
| 14 |
<%= submit_tag l(:button_apply) %> |
|
| 15 |
<% end %> |
|
| 0 | 16 | |
| trunk/lang/bg.yml | ||
|---|---|---|
| 602 | 602 |
label_last_month: last month |
| 603 | 603 |
label_add_another_file: Add another file |
| 604 | 604 |
label_optional_description: Optional description |
| 605 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 606 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 607 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 608 |
text_destroy_time_entries: Delete reported hours |
|
| 609 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/cs.yml | ||
|---|---|---|
| 602 | 602 |
label_last_month: last month |
| 603 | 603 |
label_add_another_file: Add another file |
| 604 | 604 |
label_optional_description: Optional description |
| 605 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 606 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 607 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 608 |
text_destroy_time_entries: Delete reported hours |
|
| 609 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/de.yml | ||
|---|---|---|
| 602 | 602 |
label_last_month: last month |
| 603 | 603 |
label_add_another_file: Add another file |
| 604 | 604 |
label_optional_description: Optional description |
| 605 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 606 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 607 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 608 |
text_destroy_time_entries: Delete reported hours |
|
| 609 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/en.yml | ||
|---|---|---|
| 80 | 80 |
error_can_t_load_default_data: "Default configuration could not be loaded: %s" |
| 81 | 81 |
error_scm_not_found: "Entry and/or revision doesn't exist in the repository." |
| 82 | 82 |
error_scm_command_failed: "An error occurred when trying to access the repository: %s" |
| 83 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 83 | 84 | |
| 84 | 85 |
mail_subject_lost_password: Your Redmine password |
| 85 | 86 |
mail_body_lost_password: 'To change your Redmine password, click on the following link:' |
| ... | ... | |
| 577 | 578 |
text_default_administrator_account_changed: Default administrator account changed |
| 578 | 579 |
text_file_repository_writable: File repository writable |
| 579 | 580 |
text_rmagick_available: RMagick available (optional) |
| 581 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 582 |
text_destroy_time_entries: Delete reported hours |
|
| 583 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 584 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| 580 | 585 | |
| 581 | 586 |
default_role_manager: Manager |
| 582 | 587 |
default_role_developper: Developer |
| trunk/lang/es.yml | ||
|---|---|---|
| 605 | 605 |
label_last_month: last month |
| 606 | 606 |
label_add_another_file: Add another file |
| 607 | 607 |
label_optional_description: Optional description |
| 608 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 609 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 610 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 611 |
text_destroy_time_entries: Delete reported hours |
|
| 612 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/fi.yml | ||
|---|---|---|
| 606 | 606 |
label_last_month: last month |
| 607 | 607 |
label_add_another_file: Add another file |
| 608 | 608 |
label_optional_description: Optional description |
| 609 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 610 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 611 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 612 |
text_destroy_time_entries: Delete reported hours |
|
| 613 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/fr.yml | ||
|---|---|---|
| 80 | 80 |
error_can_t_load_default_data: "Une erreur s'est produite lors du chargement du paramétrage: %s" |
| 81 | 81 |
error_scm_not_found: "L'entrée et/ou la révision demandée n'existe pas dans le dépôt." |
| 82 | 82 |
error_scm_command_failed: "Une erreur s'est produite lors de l'accès au dépôt: %s" |
| 83 |
error_issue_not_found_in_project: "La demande n'existe pas ou n'appartient pas à ce projet" |
|
| 83 | 84 | |
| 84 | 85 |
mail_subject_lost_password: Votre mot de passe redMine |
| 85 | 86 |
mail_body_lost_password: 'Pour changer votre mot de passe Redmine, cliquez sur le lien suivant:' |
| ... | ... | |
| 565 | 566 |
text_issue_added: La demande %s a été soumise par %s. |
| 566 | 567 |
text_issue_updated: La demande %s a été mise à jour par %s. |
| 567 | 568 |
text_wiki_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce wiki et tout son contenu ? |
| 568 |
text_issue_category_destroy_question: Des demandes (%d) sont affectées à cette catégories. Que voulez-vous faire ?
|
|
| 569 |
text_issue_category_destroy_question: %d demandes sont affectées à cette catégories. Que voulez-vous faire ?
|
|
| 569 | 570 |
text_issue_category_destroy_assignments: N'affecter les demandes à aucune autre catégorie |
| 570 | 571 |
text_issue_category_reassign_to: Réaffecter les demandes à cette catégorie |
| 571 | 572 |
text_user_mail_option: "Pour les projets non sélectionnés, vous recevrez seulement des notifications pour ce que vous surveillez ou à quoi vous participez (exemple: demandes dont vous êtes l'auteur ou la personne assignée)." |
| ... | ... | |
| 577 | 578 |
text_default_administrator_account_changed: Compte administrateur par défaut changé |
| 578 | 579 |
text_file_repository_writable: Répertoire de stockage des fichiers accessible en écriture |
| 579 | 580 |
text_rmagick_available: Bibliothèque RMagick présente (optionnelle) |
| 581 |
text_destroy_time_entries_question: %.02f heures ont été enregistrées sur les demandes à supprimer. Que voulez-vous faire ? |
|
| 582 |
text_destroy_time_entries: Supprimer les heures |
|
| 583 |
text_assign_time_entries_to_project: Reporter les heures sur le projet |
|
| 584 |
text_reassign_time_entries: 'Reporter les heures sur cette demande:' |
|
| 580 | 585 | |
| 581 | 586 |
default_role_manager: Manager |
| 582 | 587 |
default_role_developper: Développeur |
| trunk/lang/he.yml | ||
|---|---|---|
| 602 | 602 |
label_last_month: last month |
| 603 | 603 |
label_add_another_file: Add another file |
| 604 | 604 |
label_optional_description: Optional description |
| 605 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 606 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 607 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 608 |
text_destroy_time_entries: Delete reported hours |
|
| 609 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/it.yml | ||
|---|---|---|
| 602 | 602 |
label_last_month: last month |
| 603 | 603 |
label_add_another_file: Add another file |
| 604 | 604 |
label_optional_description: Optional description |
| 605 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 606 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 607 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 608 |
text_destroy_time_entries: Delete reported hours |
|
| 609 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/ja.yml | ||
|---|---|---|
| 603 | 603 |
label_last_month: last month |
| 604 | 604 |
label_add_another_file: Add another file |
| 605 | 605 |
label_optional_description: Optional description |
| 606 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 607 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 608 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 609 |
text_destroy_time_entries: Delete reported hours |
|
| 610 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/ko.yml | ||
|---|---|---|
| 602 | 602 |
label_last_month: last month |
| 603 | 603 |
label_add_another_file: Add another file |
| 604 | 604 |
label_optional_description: Optional description |
| 605 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 606 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 607 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 608 |
text_destroy_time_entries: Delete reported hours |
|
| 609 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/lt.yml | ||
|---|---|---|
| 603 | 603 |
label_last_month: last month |
| 604 | 604 |
label_add_another_file: Add another file |
| 605 | 605 |
label_optional_description: Optional description |
| 606 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 607 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 608 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 609 |
text_destroy_time_entries: Delete reported hours |
|
| 610 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/nl.yml | ||
|---|---|---|
| 603 | 603 |
label_last_month: last month |
| 604 | 604 |
label_add_another_file: Add another file |
| 605 | 605 |
label_optional_description: Optional description |
| 606 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 607 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 608 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 609 |
text_destroy_time_entries: Delete reported hours |
|
| 610 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/pl.yml | ||
|---|---|---|
| 602 | 602 |
label_last_month: last month |
| 603 | 603 |
label_add_another_file: Add another file |
| 604 | 604 |
label_optional_description: Optional description |
| 605 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 606 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 607 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 608 |
text_destroy_time_entries: Delete reported hours |
|
| 609 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/pt-br.yml | ||
|---|---|---|
| 602 | 602 |
label_last_month: last month |
| 603 | 603 |
label_add_another_file: Add another file |
| 604 | 604 |
label_optional_description: Optional description |
| 605 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 606 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 607 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 608 |
text_destroy_time_entries: Delete reported hours |
|
| 609 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/pt.yml | ||
|---|---|---|
| 602 | 602 |
label_last_month: last month |
| 603 | 603 |
label_add_another_file: Add another file |
| 604 | 604 |
label_optional_description: Optional description |
| 605 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 606 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 607 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 608 |
text_destroy_time_entries: Delete reported hours |
|
| 609 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/ro.yml | ||
|---|---|---|
| 602 | 602 |
label_last_month: last month |
| 603 | 603 |
label_add_another_file: Add another file |
| 604 | 604 |
label_optional_description: Optional description |
| 605 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 606 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 607 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 608 |
text_destroy_time_entries: Delete reported hours |
|
| 609 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/ru.yml | ||
|---|---|---|
| 606 | 606 |
label_last_month: last month |
| 607 | 607 |
label_add_another_file: Add another file |
| 608 | 608 |
label_optional_description: Optional description |
| 609 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 610 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 611 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 612 |
text_destroy_time_entries: Delete reported hours |
|
| 613 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/sr.yml | ||
|---|---|---|
| 603 | 603 |
label_last_month: last month |
| 604 | 604 |
label_add_another_file: Add another file |
| 605 | 605 |
label_optional_description: Optional description |
| 606 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 607 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 608 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 609 |
text_destroy_time_entries: Delete reported hours |
|
| 610 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/sv.yml | ||
|---|---|---|
| 603 | 603 |
label_last_month: last month |
| 604 | 604 |
label_add_another_file: Add another file |
| 605 | 605 |
label_optional_description: Optional description |
| 606 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 607 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 608 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 609 |
text_destroy_time_entries: Delete reported hours |
|
| 610 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/uk.yml | ||
|---|---|---|
| 604 | 604 |
label_last_month: last month |
| 605 | 605 |
label_add_another_file: Add another file |
| 606 | 606 |
label_optional_description: Optional description |
| 607 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 608 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 609 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 610 |
text_destroy_time_entries: Delete reported hours |
|
| 611 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/zh-tw.yml | ||
|---|---|---|
| 602 | 602 |
label_last_month: last month |
| 603 | 603 |
label_add_another_file: Add another file |
| 604 | 604 |
label_optional_description: Optional description |
| 605 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 606 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 607 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 608 |
text_destroy_time_entries: Delete reported hours |
|
| 609 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/lang/zh.yml | ||
|---|---|---|
| 605 | 605 |
label_last_month: last month |
| 606 | 606 |
label_add_another_file: Add another file |
| 607 | 607 |
label_optional_description: Optional description |
| 608 |
text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ? |
|
| 609 |
error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' |
|
| 610 |
text_assign_time_entries_to_project: Assign reported hours to the project |
|
| 611 |
text_destroy_time_entries: Delete reported hours |
|
| 612 |
text_reassign_time_entries: 'Reassign reported hours to this issue:' |
|
| trunk/test/functional/issues_controller_test.rb | ||
|---|---|---|
| 37 | 37 |
:workflows, |
| 38 | 38 |
:custom_fields, |
| 39 | 39 |
:custom_values, |
| 40 |
:custom_fields_trackers |
|
| 40 |
:custom_fields_trackers, |
|
| 41 |
:time_entries |
|
| 41 | 42 |
|
| 42 | 43 |
def setup |
| 43 | 44 |
@controller = IssuesController.new |
| ... | ... | |
| 428 | 429 |
:class => 'icon-del disabled' } |
| 429 | 430 |
end |
| 430 | 431 |
|
| 431 |
def test_destroy |
|
| 432 |
def test_destroy_issue_with_no_time_entries
|
|
| 432 | 433 |
@request.session[:user_id] = 2 |
| 433 |
post :destroy, :id => 1
|
|
| 434 |
post :destroy, :id => 3
|
|
| 434 | 435 |
assert_redirected_to 'projects/ecookbook/issues' |
| 435 |
assert_nil Issue.find_by_id(1)
|
|
| 436 |
assert_nil Issue.find_by_id(3)
|
|
| 436 | 437 |
end |
| 437 | 438 | |
| 439 |
def test_destroy_issues_with_time_entries |
|
| 440 |
@request.session[:user_id] = 2 |
|
| 441 |
post :destroy, :ids => [1, 3] |
|
| 442 |
assert_response :success |
|
| 443 |
assert_template 'destroy' |
|
| 444 |
assert_not_nil assigns(:hours) |
|
| 445 |
assert Issue.find_by_id(1) && Issue.find_by_id(3) |
|
| 446 |
end |
|
| 447 | ||
| 448 |
def test_destroy_issues_and_destroy_time_entries |
|
| 449 |
@request.session[:user_id] = 2 |
|
| 450 |
post :destroy, :ids => [1, 3], :todo => 'destroy' |
|
| 451 |
assert_redirected_to 'projects/ecookbook/issues' |
|
| 452 |
assert !(Issue.find_by_id(1) || Issue.find_by_id(3)) |
|
| 453 |
assert_nil TimeEntry.find_by_id([1, 2]) |
|
| 454 |
end |
|
| 455 | ||
| 456 |
def test_destroy_issues_and_assign_time_entries_to_project |
|
| 457 |
@request.session[:user_id] = 2 |
|
| 458 |
post :destroy, :ids => [1, 3], :todo => 'nullify' |
|
| 459 |
assert_redirected_to 'projects/ecookbook/issues' |
|
| 460 |
assert !(Issue.find_by_id(1) || Issue.find_by_id(3)) |
|
| 461 |
assert_nil TimeEntry.find(1).issue_id |
|
| 462 |
assert_nil TimeEntry.find(2).issue_id |
|
| 463 |
end |
|
| 464 |
|
|
| 465 |
def test_destroy_issues_and_reassign_time_entries_to_another_issue |
|
| 466 |
@request.session[:user_id] = 2 |
|
| 467 |
post :destroy, :ids => [1, 3], :todo => 'reassign', :reassign_to_id => 2 |
|
| 468 |
assert_redirected_to 'projects/ecookbook/issues' |
|
| 469 |
assert !(Issue.find_by_id(1) || Issue.find_by_id(3)) |
|
| 470 |
assert_equal 2, TimeEntry.find(1).issue_id |
|
| 471 |
assert_equal 2, TimeEntry.find(2).issue_id |
|
| 472 |
end |
|
| 473 |
|
|
| 438 | 474 |
def test_destroy_attachment |
| 439 | 475 |
issue = Issue.find(3) |
| 440 | 476 |
a = issue.attachments.size |
| trunk/test/unit/issue_test.rb | ||
|---|---|---|
| 70 | 70 |
# Make sure time entries were move to the target project |
| 71 | 71 |
assert_equal 2, issue.time_entries.first.project_id |
| 72 | 72 |
end |
| 73 |
|
|
| 74 |
def test_issue_destroy |
|
| 75 |
Issue.find(1).destroy |
|
| 76 |
assert_nil Issue.find_by_id(1) |
|
| 77 |
assert_nil TimeEntry.find_by_issue_id(1) |
|
| 78 |
end |
|
| 73 | 79 |
end |
Also available in: Unified diff