RM_531512_Smile_Changement_de_projet_demande_-_ne_plus_faire_suivre_les_sous_taches.diff

Jérôme BATAILLE, 2019-04-02 12:15

Download (6.34 KB)

View differences:

app/models/issue.rb
1583 1583
    end
1584 1584

  
1585 1585
    # Move subtasks that were in the same project
1586
    children.each do |child|
1587
      next unless child.project_id == project_id_before_last_save
1588
      # Change project and keep project
1589
      child.send :project=, project, true
1590
      unless child.save
1591
        errors.add :base, l(:error_move_of_child_not_possible, :child => "##{child.id}", :errors => child.errors.full_messages.join(", "))
1592
        raise ActiveRecord::Rollback
1586
    if Setting.subtasks_follow_project_change_of_parent?
1587
      children.each do |child|
1588
        next unless child.project_id == project_id_before_last_save
1589
        # Change project and keep project
1590
        # Added journal
1591
        child.init_journal(User.current)
1592
        child.send :project=, project, true
1593
        unless child.save
1594
          errors.add :base, l(:error_move_of_child_not_possible, :child => "##{child.id}", :errors => child.errors.full_messages.join(", "))
1595
          raise ActiveRecord::Rollback
1596
        end
1593 1597
      end
1594 1598
    end
1595 1599
  end
app/views/settings/_issues.html.erb
15 15

  
16 16
<p><%= setting_check_box :display_subprojects_issues %></p>
17 17

  
18
<p><%= setting_check_box :subtasks_follow_project_change_of_parent %></p>
19

  
18 20
<p><%= setting_select :issue_done_ratio, Issue::DONE_RATIO_OPTIONS.collect {|i| [l("setting_issue_done_ratio_#{i}"), i]} %></p>
19 21

  
20 22
<p><%= setting_multiselect :non_working_week_days, (1..7).map {|d| [day_name(d), d.to_s]}, :inline => true %></p>
config/locales/ca.yml
339 339
  setting_user_format: "Format de com mostrar l'usuari"
340 340
  setting_activity_days_default: "Dies a mostrar l'activitat del projecte"
341 341
  setting_display_subprojects_issues: "Mostra els assumptes d'un subprojecte en el projecte pare per defecte"
342
  setting_subtasks_follow_project_change_of_parent: Subtasks follow project change of parent
342 343
  setting_enabled_scm: "Activar SCM"
343 344
  setting_mail_handler_body_delimiters: "Trunca els correus electrònics després d'una d'aquestes línies"
344 345
  setting_mail_handler_api_enabled: "Activar WS per correus electrònics d'entrada"
config/locales/en-GB.yml
348 348
  setting_user_format: Users display format
349 349
  setting_activity_days_default: Days displayed on project activity
350 350
  setting_display_subprojects_issues: Display subprojects issues on main projects by default
351
  setting_subtasks_follow_project_change_of_parent: Subtasks follow project change of parent
351 352
  setting_enabled_scm: Enabled SCM
352 353
  setting_mail_handler_body_delimiters: "Truncate emails after one of these lines"
353 354
  setting_mail_handler_api_enabled: Enable WS for incoming emails
config/locales/en.yml
417 417
  setting_user_format: Users display format
418 418
  setting_activity_days_default: Days displayed on project activity
419 419
  setting_display_subprojects_issues: Display subprojects issues on main projects by default
420
  setting_subtasks_follow_project_change_of_parent: Subtasks follow project change of parent
420 421
  setting_enabled_scm: Enabled SCM
421 422
  setting_mail_handler_body_delimiters: "Truncate emails after one of these lines"
422 423
  setting_mail_handler_enable_regex: "Enable regular expressions"
config/locales/es.yml
751 751
  setting_default_projects_public: Los proyectos nuevos son públicos por defecto
752 752
  setting_diff_max_lines_displayed: Número máximo de diferencias mostradas
753 753
  setting_display_subprojects_issues: Mostrar por defecto peticiones de proy. secundarios en el principal
754
  setting_subtasks_follow_project_change_of_parent: Subtasks follow project change of parent
754 755
  setting_emails_footer: Pie de mensajes
755 756
  setting_enabled_scm: Activar SCM
756 757
  setting_feeds_limit: Límite de contenido para sindicación
config/locales/fr.yml
424 424
  setting_user_format: Format d'affichage des utilisateurs
425 425
  setting_activity_days_default: Nombre de jours affichés sur l'activité des projets
426 426
  setting_display_subprojects_issues: Afficher par défaut les demandes des sous-projets sur les projets principaux
427
  setting_subtasks_follow_project_change_of_parent: Changer les sous-tâches de projet si le parent change de projet
427 428
  setting_enabled_scm: SCM activés
428 429
  setting_mail_handler_body_delimiters: "Tronquer les emails après l'une de ces lignes"
429 430
  setting_mail_handler_enable_regex: "Utiliser les expressions regulières"
config/locales/uk.yml
713 713
  label_reverse_chronological_order: В зворотньому порядку
714 714
  label_preferences: Переваги
715 715
  setting_display_subprojects_issues: Відображення підпроектів по замовчуванню
716
  setting_subtasks_follow_project_change_of_parent: Subtasks follow project change of parent
716 717
  label_overall_activity: Зведений звіт дій
717 718
  setting_default_projects_public: Нові проекти є загальнодоступними
718 719
  error_scm_annotate: "Коментар неможливий через перевищення максимального розміру текстового файлу."
config/settings.yml
209 209
  default: []
210 210
display_subprojects_issues:
211 211
  default: 1
212
subtasks_follow_project_change_of_parent:
213
  default: 1
212 214
time_entry_list_defaults:
213 215
  serialized: true
214 216
  default: