jro_apps/redmine Commit - r673:404bfce44691

Added a cross-project issue list. It displays the issues of all the projects visible by the user....

Jean-Philippe Lang -

r673:404bfce44691

parent child

Context file:

r673:404bfce44691

Collapse all files

app/views/issues/index.rhtml created 644 +55 0

@@ -0,0 +1,55
	1	<h2><%=l(:label_issue_plural)%></h2>
	2
	3	<% form_tag({}, :id => 'query_form') do %>
	4	<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
	5	<% end %>
	6	<div class="contextual">
	7	<%= link_to_remote l(:button_apply),
	8	{ :url => { :set_filter => 1 },
	9	:update => "content",
	10	:with => "Form.serialize('query_form')"
	11	}, :class => 'icon icon-edit' %>
	12
	13	<%= link_to_remote l(:button_clear),
	14	{ :url => { :set_filter => 1 },
	15	:update => "content",
	16	}, :class => 'icon icon-reload' %>
	17	</div>
	18	<br />
	19
	20	<%= error_messages_for 'query' %>
	21	<% if @query.valid? %>
	22	<% if @issues.empty? %>
	23	<p><i><%= l(:label_no_data) %></i></p>
	24	<% else %>
	25
	26	<table class="list">
	27	<thead><tr>
	28	<%= sort_header_tag("#{Issue.table_name}.id", :caption => '#') %>
	29	<%= sort_header_tag("#{Project.table_name}.name", :caption => l(:field_project)) %>
	30	<%= sort_header_tag("#{Issue.table_name}.tracker_id", :caption => l(:field_tracker)) %>
	31	<%= sort_header_tag("#{IssueStatus.table_name}.name", :caption => l(:field_status)) %>
	32	<%= sort_header_tag("#{Issue.table_name}.priority_id", :caption => l(:field_priority)) %>
	33	<th><%=l(:field_subject)%></th>
	34	<%= sort_header_tag("#{User.table_name}.lastname", :caption => l(:field_assigned_to)) %>
	35	<%= sort_header_tag("#{Issue.table_name}.updated_on", :caption => l(:field_updated_on)) %>
	36	</tr></thead>
	37	<tbody>
	38	<% for issue in @issues %>
	39	<tr class="<%= cycle("odd", "even") %>">
	40	<td align="center" valign="top"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
	41	<td align="center" valign="top" nowrap><%=h issue.project.name %></td>
	42	<td align="center" valign="top" nowrap><%= issue.tracker.name %></td>
	43	<td valign="top"nowrap><div class="square" style="background:#<%= issue.status.html_color %>;"></div> <%= issue.status.name %></td>
	44	<td align="center" valign="top"><%= issue.priority.name %></td>
	45	<td><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></td>
	46	<td align="center" valign="top" nowrap><%= issue.assigned_to.name if issue.assigned_to %></td>
	47	<td align="center" valign="top" nowrap><%= format_time(issue.updated_on) %></td>
	48	</tr>
	49	<% end %>
	50	</tbody>
	51	</table>
	52	<p><%= pagination_links_full @issue_pages %>
	53	[ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]</p>
	54	<% end %>
	55	<% end %>

app/controllers/issues_controller.rb +42 -3

@@ -17,7 +17,7
17		17
18	class IssuesController < ApplicationController	18	class IssuesController < ApplicationController
19	layout 'base', :except => :export_pdf	19	layout 'base', :except => :export_pdf
20	before_filter :find_project, :authorize	20	before_filter :find_project, :authorize, :except => :index
21		21
22	cache_sweeper :issue_sweeper, :only => [ :edit, :change_status, :destroy ]	22	cache_sweeper :issue_sweeper, :only => [ :edit, :change_status, :destroy ]
23		23
@@ -32,8 +32,27 class IssuesController < ApplicationController
32	helper :watchers	32	helper :watchers
33	include WatchersHelper	33	include WatchersHelper
34	helper :attachments	34	helper :attachments
35	include AttachmentsHelper	35	include AttachmentsHelper
		36	helper :queries
		37	helper :sort
		38	include SortHelper
36		39
		40	def index
		41	sort_init "#{Issue.table_name}.id", "desc"
		42	sort_update
		43	retrieve_query
		44	if @query.valid?
		45	@issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
		46	@issue_pages = Paginator.new self, @issue_count, 25, params['page']
		47	@issues = Issue.find :all, :order => sort_clause,
		48	:include => [ :assigned_to, :status, :tracker, :project, :priority ],
		49	:conditions => @query.statement,
		50	:limit => @issue_pages.items_per_page,
		51	:offset => @issue_pages.current.offset
		52	end
		53	render :layout => false if request.xhr?
		54	end
		55
37	def show	56	def show
38	@status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user	57	@status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
39	@custom_values = @issue.custom_values.find(:all, :include => :custom_field)	58	@custom_values = @issue.custom_values.find(:all, :include => :custom_field)
@@ -149,5 +168,25 private
149	@html_title = "#{@project.name} - #{@issue.tracker.name} ##{@issue.id}"	168	@html_title = "#{@project.name} - #{@issue.tracker.name} ##{@issue.id}"
150	rescue ActiveRecord::RecordNotFound	169	rescue ActiveRecord::RecordNotFound
151	render_404	170	render_404
152	end	171	end
		172
		173	# Retrieve query from session or build a new query
		174	def retrieve_query
		175	if params[:set_filter] or !session[:query] or session[:query].project_id
		176	# Give it a name, required to be valid
		177	@query = Query.new(:name => "_", :executed_by => logged_in_user)
		178	if params[:fields] and params[:fields].is_a? Array
		179	params[:fields].each do \|field\|
		180	@query.add_filter(field, params[:operators][field], params[:values][field])
		181	end
		182	else
		183	@query.available_filters.keys.each do \|field\|
		184	@query.add_short_filter(field, params[field]) if params[field]
		185	end
		186	end
		187	session[:query] = @query
		188	else
		189	@query = session[:query]
		190	end
		191	end
153	end	192	end

app/models/project.rb +3 -3

               def self.visible_by(user=nil)
                 if user && user.admin?
-                  return ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"]
+                  return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
                 elsif user && user.memberships.any?
-                  return ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND (#{Project.table_name}.is_public = ? or #{Project.table_name}.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')}))", true]
+                  return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND (#{Project.table_name}.is_public = #{connection.quoted_true} or #{Project.table_name}.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')}))"
                 else
-                  return ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND #{Project.table_name}.is_public = ?", true]
+                  return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND #{Project.table_name}.is_public = #{connection.quoted_true}"
                 end
               end

app/models/query.rb +19 -10

                                        "updated_on" => { :type => :date_past, :order => 10 },
                                        "start_date" => { :type => :date, :order => 11 },
                                        "due_date" => { :type => :date, :order => 12 } }
-                unless project.nil?
-                  # project specific filters
+                user_values = []
-                  user_values = []
+                if project
+                  user_values += project.users.collect{|s| [s.name, s.id.to_s] }
+                elsif executed_by
                   user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by
-                  user_values += @project.users.collect{|s| [s.name, s.id.to_s] }
+                  # members of the user's projects
+                  user_values += executed_by.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }
-                  @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values }
+                end
-                  @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values }
+                @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values } unless user_values.empty?
+                @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values } unless user_values.empty?
+                if project
+                  # project specific filters
                   @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?
               def statement
                 # project/subprojects clause
                 clause = ''
-                if has_filter?("subproject_id")
+                if project && has_filter?("subproject_id")
                   subproject_ids = []
                   if operator_for("subproject_id") == "="
                     subproject_ids = values_for("subproject_id").each(&:to_i)
                     subproject_ids = project.active_children.collect{|p| p.id}
                   end
                   clause << "#{Issue.table_name}.project_id IN (%d,%s)" % [project.id, subproject_ids.join(",")] if project
+                elsif project
+                  clause << "#{Issue.table_name}.project_id=%d" % project.id
                 else
-                  clause << "#{Issue.table_name}.project_id=%d" % project.id if project
+                  clause << Project.visible_by(executed_by)
                 end
                 # filters clauses
                   filters_clauses << sql
                 end if filters and valid?
-                clause << (' AND ' + filters_clauses.join(' AND ')) unless filters_clauses.empty?
+                clause << ' AND ' unless clause.empty?
+                clause << filters_clauses.join(' AND ') unless filters_clauses.empty?
                 clause
               end
             end

app/views/my/blocks/_issuesassignedtome.rhtml +2 -2

                                             :conditions => ["assigned_to_id=? AND #{IssueStatus.table_name}.is_closed=? AND #{Project.table_name}.status=#{Project::STATUS_ACTIVE}", user.id, false],
                                             :limit => 10,
                                             :include => [ :status, :project, :tracker ],
-                                            :order => "#{Issue.table_name}.updated_on DESC") %>
+                                            :order => "#{Issue.table_name}.priority_id DESC, #{Issue.table_name}.updated_on DESC") %>
             <%= render :partial => 'issues/list_simple', :locals => { :issues => assigned_issues } %>
             <% if assigned_issues.length > 0 %>
-            <p><%=lwr(:label_last_updates, assigned_issues.length)%></p>
+            <p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :set_filter => 1, :assigned_to_id => 'me' %></p>
             <% end %>

app/views/my/blocks/_issuesreportedbyme.rhtml +2 -2

                                             :order => "#{Issue.table_name}.updated_on DESC") %>
             <%= render :partial => 'issues/list_simple', :locals => { :issues => reported_issues } %>
             <% if reported_issues.length > 0 %>
-            <p><%=lwr(:label_last_updates, reported_issues.length)%></p>
+            <p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :set_filter => 1, :author_id => 'me' %></p>
-            <% end %>
  No newline at end of file
+            <% end %>

test/functional/my_controller_test.rb +3 -2

             class MyController; def rescue_action(e) raise e end; end
             class MyControllerTest < Test::Unit::TestCase
+              fixtures :users
               def setup
                 @controller = MyController.new
                 @request    = ActionController::TestRequest.new
               def test_update_account
                 post :account, :user => {:firstname => "Joe", :login => "root", :admin => 1}
-                assert_response :success
+                assert_redirected_to 'my/account'
-                assert_template 'account'
                 user = User.find(2)
                 assert_equal user, assigns(:user)
                 assert_equal "Joe", user.firstname

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