jro_apps/redmine Commit - r1184:533994e5ea00

Jicamarca Repository

0

- This repo
- ?
- Use '/' key to quickly access this field. - Enter a name of repository, or repository group for quick search. - Prefix query to allow special search: user:admin, to search for usernames, always global user_group:devops, to search for user groups, always global pr:303, to search for pull request number, title, or description, always global commit:efced4, to search for commits, scoped to repositories or groups file:models.py, to search for file paths, scoped to repositories or groups For advanced full text search visit: repository search
Home
Public journal
Gists
Sign in

jro_apps » redmine

RSS

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....

Jean-Philippe Lang -

r1184:533994e5ea00

parent child

Context file:

r1184:533994e5ea00

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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

                 @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,
                 @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

@@ -261,12 +261,19 class Query < ActiveRecord::Base
261	clause = ''	261	clause = ''
262	if project && !@project.active_children.empty?	262	if project && !@project.active_children.empty?
263	ids = [project.id]	263	ids = [project.id]
264	if has_filter?("subproject_id") && ~~operator_for~~(~~"subproject_id"~~) == ~~"="~~	264	if has_filter?("subproject_id")
265	# include the selected subprojects	265	case operator_for("subproject_id")
266	ids += values_for("subproject_id").each(&:to_i)	266	when '='
267	else	267	# include the selected subprojects
268	# include all the subprojects unless 'none' is selected	268	ids += values_for("subproject_id").each(&:to_i)
269	ids += project.active_children.collect{\|p\| p.id} unless has_filter?("subproject_id") && operator_for("subproject_id") == "!*"	269	when '!*'
		270	# main project only
		271	else
		272	# all subprojects
		273	ids += project.active_children.collect{\|p\| p.id}
		274	end
		275	elsif Setting.display_subprojects_issues?
		276	ids += project.active_children.collect{\|p\| p.id}
270	end	277	end
271	clause << "#{Issue.table_name}.project_id IN (%s)" % ids.join(',')	278	clause << "#{Issue.table_name}.project_id IN (%s)" % ids.join(',')
272	elsif project	279	elsif project

             <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>

               - 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:

             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

             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

             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é