Adds an application setting to choose whether or not subprojects issues should be...

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1198 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index b9758c8109091078629bf5d3afe581ea937b11f0..af5960399a437b77d50064a2179da80eec885dda 100644 (file)
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -302,7 +302,7 @@ class ProjectsController < ApplicationController
     @year ||= Date.today.year
     @month ||= Date.today.month    
     @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
-    @with_subprojects = params[:with_subprojects].nil? ? true : (params[:with_subprojects] == '1')
+    @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
     events = []
     @project.issues_with_subprojects(@with_subprojects) do
       events += Issue.find(:all, 
@@ -345,7 +345,7 @@ class ProjectsController < ApplicationController
     
     @date_from = Date.civil(@year_from, @month_from, 1)
     @date_to = (@date_from >> @months) - 1
-    @with_subprojects = params[:with_subprojects].nil? ? true : (params[:with_subprojects] == '1')
+    @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
     
     @events = []
     @project.issues_with_subprojects(@with_subprojects) do

diff --git a/app/models/query.rb b/app/models/query.rb
index 73828f739530b8b2e8fc284056153563537eed53..665280ac2132ae5c3ac546c9cbc7a35a9f9891c9 100644 (file)
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -261,12 +261,19 @@ class Query < ActiveRecord::Base
     clause = ''
     if project && !@project.active_children.empty?
       ids = [project.id]
-      if has_filter?("subproject_id") && operator_for("subproject_id") == "="
-        # include the selected subprojects
-        ids += values_for("subproject_id").each(&:to_i)
-      else
-        # include all the subprojects unless 'none' is selected
-        ids += project.active_children.collect{|p| p.id} unless has_filter?("subproject_id") && operator_for("subproject_id") == "!*"
+      if has_filter?("subproject_id")
+        case operator_for("subproject_id")
+        when '='
+          # include the selected subprojects
+          ids += values_for("subproject_id").each(&:to_i)
+        when '!*'
+          # main project only
+        else
+          # all subprojects
+          ids += project.active_children.collect{|p| p.id}
+        end
+      elsif Setting.display_subprojects_issues?
+        ids += project.active_children.collect{|p| p.id}
       end
       clause << "#{Issue.table_name}.project_id IN (%s)" % ids.join(',')
     elsif project

diff --git a/app/views/settings/_issues.rhtml b/app/views/settings/_issues.rhtml
index 36c604fd9da3e3dc7877e143690d596c299f9d0e..bbd7356fd7cebd7db45a2c549b641b10203850da 100644 (file)
--- a/app/views/settings/_issues.rhtml
+++ b/app/views/settings/_issues.rhtml
@@ -4,6 +4,9 @@
 <p><label><%= l(:setting_cross_project_issue_relations) %></label>
 <%= check_box_tag 'settings[cross_project_issue_relations]', 1, Setting.cross_project_issue_relations? %><%= hidden_field_tag 'settings[cross_project_issue_relations]', 0 %></p>
 
+<p><label><%= l(:setting_display_subprojects_issues) %></label>
+<%= check_box_tag 'settings[display_subprojects_issues]', 1, Setting.display_subprojects_issues? %><%= hidden_field_tag 'settings[display_subprojects_issues]', 0 %></p>
+
 <p><label><%= l(:setting_issues_export_limit) %></label>
 <%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p>
 </div>

diff --git a/config/settings.yml b/config/settings.yml
index bb8c1f60384f63287a535b596a72c61e9b66cc72..59f4f043736b49facb1a06a89b936b42c8238c32 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -101,6 +101,8 @@ issue_list_default_columns:
   - subject
   - assigned_to
   - updated_on
+display_subprojects_issues:
+  default: 1
 # encodings used to convert repository files content to UTF-8
 # multiple values accepted, comma separated
 repositories_encodings:

diff --git a/lang/bg.yml b/lang/bg.yml
index 11e18b8499c05104913a46b9da7504535871ad06..7e65a9d2ac2297a660a2a01a553d280ef8f8aa18 100644 (file)
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -612,3 +612,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/cs.yml b/lang/cs.yml
index ccf93fb9c4e7eb9448d4a67e37e9cf31e7c4dcba..95e597c7e0b6ea2891fe20a8f5fde9fde6ba5307 100644 (file)
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -612,3 +612,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/de.yml b/lang/de.yml
index bdbe549c28b056fb8044339b93e9dfccccf9abec..09e23f4f318ac55677da246bea2f4884c298358b 100644 (file)
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -613,3 +613,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/en.yml b/lang/en.yml
index 0445834fe5b065625d6f4019b687620fe4d6cb1d..be7e1eb74cb3b00c502537959ad02397f11346bf 100644 (file)
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -208,6 +208,7 @@ setting_protocol: Protocol
 setting_per_page_options: Objects per page options
 setting_user_format: Users display format
 setting_activity_days_default: Days displayed on project activity
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
 
 project_module_issue_tracking: Issue tracking
 project_module_time_tracking: Time tracking

diff --git a/lang/es.yml b/lang/es.yml
index d137054d904f63271a06de16f91a31b2565163d9..fe8a419d6ca1853a386aeecc7a0a130312cfdeaa 100644 (file)
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -615,3 +615,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/fi.yml b/lang/fi.yml
index b2ad672f4f1dd05ff4db19201b48c6e579c1c69c..9b45263d2e13d2c31eb9882f887b67d063471d00 100644 (file)
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -616,3 +616,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/fr.yml b/lang/fr.yml
index b992ceff26d3f467091781a98e57f3d30ad92932..3370ba71b760a18ce37a205584b269f9d8390724 100644 (file)
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -208,6 +208,7 @@ setting_protocol: Protocole
 setting_per_page_options: Options d'objets affichés par page
 setting_user_format: Format d'affichage des utilisateurs
 setting_activity_days_default: Nombre de jours affichés sur l'activité des projets
+setting_display_subprojects_issues: Afficher par défaut les demandes des sous-projets sur les projets principaux
 
 project_module_issue_tracking: Suivi des demandes
 project_module_time_tracking: Suivi du temps passé

diff --git a/lang/he.yml b/lang/he.yml
index 66a493bbbb6c502ee6bb93c5cf01981fead015df..b8cb9d4b6f386de093433e1599bf56f9328f155a 100644 (file)
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -612,3 +612,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/it.yml b/lang/it.yml
index c47729c504d4c1d03d6d6165b3bdeafd8187de04..3a07a2f989e8c0dc6f089ba49a5baeadcaf615c0 100644 (file)
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -612,3 +612,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/ja.yml b/lang/ja.yml
index 37392dd7e2b3a65d94caeaaa560f1e11c20fc8fb..84fa5e6df910aa079af2841ac5edd5ea82bb25dd 100644 (file)
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -613,3 +613,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/ko.yml b/lang/ko.yml
index 5685d063a209a9580c4b332db7c8f86454603c71..9e5f5a7ce6187962ffbf46e4b3dbadcb833725a3 100644 (file)
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -612,3 +612,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/lt.yml b/lang/lt.yml
index c783f5768727edbbb23979608793fdb0d89611d7..5440d6af9ccee923a417a22b8391873810d7681b 100644 (file)
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -613,3 +613,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/nl.yml b/lang/nl.yml
index 6d650456d242bc8926ad416582b91da64d8c657d..43d7811809ba23c3b5afc8f6c7ea9b2b88ade1e6 100644 (file)
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -613,3 +613,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/pl.yml b/lang/pl.yml
index bf8f3f1ba11aee4ad54e9efc7232fae61c263808..7368a5a660fa32aecdf9cd6af4e1bca5f670e52d 100644 (file)
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -612,3 +612,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 9ddd6f94bb8daf992c69b55084ec416fa6916edc..e3b50bdb469b7a2955067ba0416e74751b473bda 100644 (file)
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -612,3 +612,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires\r
 label_reverse_chronological_order: In reverse chronological order\r
 label_preferences: Preferences\r
+setting_display_subprojects_issues: Display subprojects issues on main projects by default\r

diff --git a/lang/pt.yml b/lang/pt.yml
index 63972d0424f1596b2a1bd6607cdf479d3bfc7d0a..034da0db97098bebf79b383f4aa3574a864ad643 100644 (file)
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -612,3 +612,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/ro.yml b/lang/ro.yml
index 9d374af531c1180f8a83e18c0bf223d1fba7b48e..52011ff76d05a8b9707a3dd2f5a65c37078350cd 100644 (file)
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -612,3 +612,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/ru.yml b/lang/ru.yml
index d5b67f964ffcd149194270f0a1ffa64316733b15..400e48448038c152af8b4478d8694ebae1032c26 100644 (file)
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -616,3 +616,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/sr.yml b/lang/sr.yml
index edef5f7f50e1e43d75e37c825afcb4022acc6be1..c48a4e63ff82296b26ffa649f2c202e15a70f35c 100644 (file)
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -613,3 +613,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/sv.yml b/lang/sv.yml
index f3940759bf8443339131a8ffbb85555490f95dc1..125e2dcc7e582584e5f804bc7c1419a7d1a3045f 100644 (file)
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -613,3 +613,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/uk.yml b/lang/uk.yml
index d8e4a7a66c5e32ec4da0d2c9e94bc10d21728021..15537057661eab5740a3e49c5a9240789aa4c1f7 100644 (file)
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -614,3 +614,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index eb1a5e305d784b6ed39cdc67c48694a94402ca70..7cc11c6112e9b0348721d562290a80a29bc772d7 100644 (file)
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -613,3 +613,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

diff --git a/lang/zh.yml b/lang/zh.yml
index e7d790938d8955eabb7660dddb89637eec96f42a..0b17b4ff9a9bbef56e3894bb4a9615483e981be3 100644 (file)
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -613,3 +613,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default