jro_apps/redmine Commit - r1164:b6bd5c7f12af

Include subprojects on the issue list, calendar and gantt by default....

Jean-Philippe Lang -

r1164:b6bd5c7f12af

parent child

Context file:

r1164:b6bd5c7f12af

Collapse all files

app/controllers/projects_controller.rb +13 -6

                 @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
                 @subprojects = @project.active_children
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
-                @trackers = @project.trackers
+                @trackers = @project.rolled_up_trackers
-                @open_issues_by_tracker = Issue.count(:group => :tracker, :joins => "INNER JOIN #{IssueStatus.table_name} ON #{IssueStatus.table_name}.id = #{Issue.table_name}.status_id", :conditions => ["project_id=? and #{IssueStatus.table_name}.is_closed=?", @project.id, false])
+                Issue.visible_by(User.current) do
-                @total_issues_by_tracker = Issue.count(:group => :tracker, :conditions => ["project_id=?", @project.id])
+                  @open_issues_by_tracker = Issue.count(:group => :tracker,
+                                                        :include => [:project, :status, :tracker],
+                                                        :conditions => ["(#{Project.table_name}.id=? OR #{Project.table_name}.parent_id=?) and #{IssueStatus.table_name}.is_closed=?", @project.id, @project.id, false])
+                  @total_issues_by_tracker = Issue.count(:group => :tracker,
+                                                        :include => [:project, :status, :tracker],
+                                                        :conditions => ["#{Project.table_name}.id=? OR #{Project.table_name}.parent_id=?", @project.id, @project.id])
+                end
                 TimeEntry.visible_by(User.current) do
                   @total_hours = TimeEntry.sum(:hours,
                                                :include => :project,
                 @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')
                 events = []
-                @project.issues_with_subprojects(params[:with_subprojects]) do
+                @project.issues_with_subprojects(@with_subprojects) do
                   events += Issue.find(:all,
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
                                        :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?)) AND #{Issue.table_name}.tracker_id IN (#{@selected_tracker_ids.join(',')})", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
                 @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')
                 @events = []
-                @project.issues_with_subprojects(params[:with_subprojects]) do
+                @project.issues_with_subprojects(@with_subprojects) do
                   @events += Issue.find(:all,
                                        :order => "start_date, due_date",
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],

app/models/issue.rb +6 0

@@ -231,4 +231,10 class Issue < ActiveRecord::Base
231	def soonest_start	231	def soonest_start
232	@soonest_start \|\|= relations_to.collect{\|relation\| relation.successor_soonest_start}.compact.min	232	@soonest_start \|\|= relations_to.collect{\|relation\| relation.successor_soonest_start}.compact.min
233	end	233	end
		234
		235	def self.visible_by(usr)
		236	with_scope(:find => { :conditions => Project.visible_by(usr) }) do
		237	yield
		238	end
		239	end
234	end	240	end

app/models/query.rb +11 -9

               @@operators_by_filter_type = { :list => [ "=", "!" ],
                                              :list_status => [ "o", "=", "!", "c", "*" ],
                                              :list_optional => [ "=", "!", "!*", "*" ],
-                                             :list_one_or_more => [ "*", "=" ],
+                                             :list_subprojects => [ "*", "!*", "=" ],
                                              :date => [ "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-" ],
                                              :date_past => [ ">t-", "<t-", "t-", "t", "w" ],
                                              :string => [ "=", "~", "!", "!~" ],
                   @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
                   @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.sort.collect{|s| [s.name, s.id.to_s] } }
                   unless @project.active_children.empty?
-                    @available_filters["subproject_id"] = { :type => :list_one_or_more, :order => 13, :values => @project.active_children.collect{|s| [s.name, s.id.to_s] } }
+                    @available_filters["subproject_id"] = { :type => :list_subprojects, :order => 13, :values => @project.active_children.collect{|s| [s.name, s.id.to_s] } }
                   end
                   @project.all_custom_fields.select(&:is_filter?).each do |field|
                     case field.field_format
               def statement
                 # project/subprojects clause
                 clause = ''
-                if project && has_filter?("subproject_id")
+                if project && !@project.active_children.empty?
-                  subproject_ids = []
+                  ids = [project.id]
-                  if operator_for("subproject_id") == "="
+                  if has_filter?("subproject_id") && operator_for("subproject_id") == "="
-                    subproject_ids = values_for("subproject_id").each(&:to_i)
+                    # include the selected subprojects
+                    ids += values_for("subproject_id").each(&:to_i)
                   else
-                    subproject_ids = project.active_children.collect{|p| p.id}
+                    # 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") == "!*"
                   end
-                  clause << "#{Issue.table_name}.project_id IN (%d,%s)" % [project.id, subproject_ids.join(",")] if project
+                  clause << "#{Issue.table_name}.project_id IN (%s)" % ids.join(',')
                 elsif project
-                  clause << "#{Issue.table_name}.project_id=%d" % project.id
+                  clause << "#{Issue.table_name}.project_id = %d" % project.id
                 else
                   clause << Project.visible_by(User.current)
                 end

app/views/projects/calendar.rhtml +3 -2

                   <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %></label><br />
                 <% end %>
                 <% if @project.active_children.any? %>
-                <br /><label><%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%=l(:label_subproject_plural)%></label>
+                <br /><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label>
+                <%= hidden_field_tag 'with_subprojects', 0 %>
                 <% end %>
-                <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
+                <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
                 <% end %>
             <% end %>

app/views/projects/gantt.rhtml +2 -1

                   <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %></label><br />
                 <% end %>
                 <% if @project.active_children.any? %>
-                <br /><label><%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%=l(:label_subproject_plural)%></label>
+                <br /><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label>
+                <%= hidden_field_tag 'with_subprojects', 0 %>
                 <% end %>
                 <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
                 <% end %>

app/views/queries/_filters.rhtml +1 -1

                 <td valign="top">
                 <div id="div_values_<%= field %>" style="display:none;">
                 <% case options[:type]
-                when :list, :list_optional, :list_status, :list_one_or_more %>
+                when :list, :list_optional, :list_status, :list_subprojects %>
                     <select <%= "multiple=true" if query.values_for(field) and query.values_for(field).length > 1 %> name="values[<%= field %>][]" id="values_<%= field %>" class="select-small" style="vertical-align: top;">
                     <%= options_for_select options[:values], query.values_for(field) %>
                     </select>

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