Skip to content

O
OHR Support
Commit 533994e5 authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

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

Adds an application setting to choose whether or not subprojects issues should be displayed by default on the issue list, calendar and gantt (r1178). Default is true.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1198 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent e951d845
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 8 deletions
app/controllers/projects_controller.rb
View file @ 533994e5
......@@ -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
......
app/models/query.rb
View file @ 533994e5
......@@ -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
......
app/views/settings/_issues.rhtml
View file @ 533994e5
......@@ -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>
......
config/settings.yml
View file @ 533994e5
......@@ -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:
......
lang/bg.yml
View file @ 533994e5
......@@ -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
lang/cs.yml
View file @ 533994e5
......@@ -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
lang/de.yml
View file @ 533994e5
......@@ -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
lang/en.yml
View file @ 533994e5
......@@ -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
......
lang/es.yml
View file @ 533994e5
......@@ -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
lang/fi.yml
View file @ 533994e5
......@@ -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
lang/fr.yml
View file @ 533994e5
......@@ -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é
......
lang/he.yml
View file @ 533994e5
......@@ -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
lang/it.yml
View file @ 533994e5
......@@ -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
lang/ja.yml
View file @ 533994e5
......@@ -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
lang/ko.yml
View file @ 533994e5
......@@ -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
lang/lt.yml
View file @ 533994e5
......@@ -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
lang/nl.yml
View file @ 533994e5
......@@ -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
lang/pl.yml
View file @ 533994e5
......@@ -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
lang/pt-br.yml
View file @ 533994e5
......@@ -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
lang/pt.yml
View file @ 533994e5
......@@ -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
lang/ro.yml
View file @ 533994e5
......@@ -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
lang/ru.yml
View file @ 533994e5
......@@ -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
lang/sr.yml
View file @ 533994e5
......@@ -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
lang/sv.yml
View file @ 533994e5
......@@ -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
lang/uk.yml
View file @ 533994e5
......@@ -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
lang/zh-tw.yml
View file @ 533994e5
......@@ -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
lang/zh.yml
View file @ 533994e5
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment