jro_apps/redmine Commit - r4:366ca57c36df

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

Jean-Philippe Lang -

r4:366ca57c36df

parent child

Context file:

r4:366ca57c36df

Collapse all files

redmine/app/controllers/projects_controller.rb +56 -38

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class ProjectsController < ApplicationController
-            	layout 'base'
+              layout 'base'
-            	before_filter :find_project, :authorize, :except => [ :index, :list, :add ]
+              before_filter :find_project, :authorize, :except => [ :index, :list, :add ]
               before_filter :require_admin, :only => [ :add, :destroy ]
               helper :sort
-            	include SortHelper
+              include SortHelper
-            	helper :search_filter
+              helper :search_filter
-            	include SearchFilterHelper
+              include SearchFilterHelper
-            	helper :custom_fields
+              helper :custom_fields
-            	include CustomFieldsHelper
+              include CustomFieldsHelper
-            	def index
+              def index
-            		list
+                list
-            		render :action => 'list'
+                render :action => 'list'
-            	end
+              end
             	# Lists public projects
             	def list
             		sort_init 'projects.name', 'asc'
             		sort_update
             		@project_count = Project.count(["public=?", true])
             		@project_pages = Paginator.new self, @project_count,
 ,
             								@params['page']
             		@projects = Project.find :all, :order => sort_clause,
             						:conditions => ["public=?", true],
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
               end
               # Add a new project
             	def add
             		@custom_fields = CustomField::find_all
             		@project = Project.new(params[:project])
             		if request.post?
             			@project.custom_fields = CustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids]
             			if @project.save
             				flash[:notice] = 'Project was successfully created.'
             				redirect_to :controller => 'admin', :action => 'projects'
             			end
             		end
             	end
             	# Show @project
             	def show
                 @members = @project.members.find(:all, :include => [:user, :role])
             	end
               def settings
             		@custom_fields = CustomField::find_all
             		@issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
                 @roles = Role.find_all
                 @users = User.find_all - @project.members.find(:all, :include => :user).collect{|m| m.user }
               end
             	# Edit @project
             	def edit
             		if request.post?
             			@project.custom_fields = CustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids]
             			if @project.update_attributes(params[:project])
             				flash[:notice] = 'Project was successfully updated.'
             				redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
             			end
             		end
               end
             	# Delete @project
             	def destroy
                 if request.post? and params[:confirm]
                   @project.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 end
             	end
             	# Add a new issue category to @project
             	def add_issue_category
             		if request.post?
             			@issue_category = @project.issue_categories.build(params[:issue_category])
             			if @issue_category.save
             				redirect_to :action => 'settings', :id => @project
             			else
                     settings
                     render :action => 'settings'
             			end
             		end
             	end
             	# Add a new version to @project
             	def add_version
             		@version = @project.versions.build(params[:version])
             		if request.post? and @version.save
                   redirect_to :action => 'settings', :id => @project
             		end
             	end
             	# Add a new member to @project
             	def add_member
                 @member = @project.members.build(params[:member])
             		if request.post?
             			if @member.save
                     flash[:notice] = 'Member was successfully added.'
             				redirect_to :action => 'settings', :id => @project
             			else
                     settings
                     render :action => 'settings'
                   end
             		end
             	end
             	# Show members list of @project
             	def list_members
             		@members = @project.members
             	end
             	# Add a new document to @project
             	def add_document
             		@categories = Enumeration::get_values('DCAT')
             		@document = @project.documents.build(params[:document])
             		if request.post?
                   # Save the attachment
             			if params[:attachment][:file].size > 0
             				@attachment = @document.attachments.build(params[:attachment])
                     @attachment.author_id = session[:user].id unless session[:user].nil?
             			end
             			if @document.save
             				redirect_to :action => 'list_documents', :id => @project
             			end
             		end
             	end
             	# Show documents list of @project
             	def list_documents
             		@documents = @project.documents
             	end
             	# Add a new issue to @project
             	def add_issue
             		@trackers = Tracker.find(:all)
             		@priorities = Enumeration::get_values('IPRI')
             		if request.get?
             			@issue = @project.issues.build
             			@custom_values = @project.custom_fields_for_issues.collect { |x| CustomValue.new(:custom_field => x) }
             		else
             			# Create the issue and set the author
             			@issue = @project.issues.build(params[:issue])
                   @issue.author = session[:user] unless session[:user].nil?
             			# Create the document if a file was sent
             			if params[:attachment][:file].size > 0
             				@attachment = @issue.attachments.build(params[:attachment])
                     @attachment.author_id = session[:user].id unless session[:user].nil?
             			end
             			@custom_values = @project.custom_fields_for_issues.collect { |x| CustomValue.new(:custom_field => x, :value => params["custom_fields"][x.id.to_s]) }
             			@issue.custom_values = @custom_values
             			if @issue.save
                     flash[:notice] = "Issue was successfully added."
             				Mailer.deliver_issue_add(@issue) if Permission.find_by_controller_and_action(@params[:controller], @params[:action]).mail_enabled?
             				redirect_to :action => 'list_issues', :id => @project
             			end
             		end
             	end
-            	# Show issues list of @project
+              # Show issues list of @project
-            	def list_issues
+              def list_issues
-            		sort_init 'issues.id', 'desc'
+                sort_init 'issues.id', 'desc'
-            		sort_update
+                sort_update
-            		search_filter_criteria 'issues.tracker_id', :values => "Tracker.find(:all)"
+                search_filter_init_list_issues
-            		search_filter_criteria 'issues.priority_id', :values => "Enumeration.find(:all, :conditions => ['opt=?','IPRI'])"
+                search_filter_update if params[:set_filter] or request.post?
-            		search_filter_criteria 'issues.category_id', :values => "@project.issue_categories"
-            		search_filter_criteria 'issues.status_id', :values => "IssueStatus.find(:all)"
+                @issue_count = Issue.count(:include => :status, :conditions => search_filter_clause)
-            		search_filter_criteria 'issues.author_id', :values => "User.find(:all)", :label => "display_name"
+                @issue_pages = Paginator.new self, @issue_count, 15, @params['page']
-            		search_filter_update if params[:set_filter] or request.post?
+                @issues =  Issue.find :all, :order => sort_clause,
-            		@issue_count = @project.issues.count(search_filter_clause)
-            		@issue_pages = Paginator.new self, @issue_count,
-,
-            								@params['page']
-            		@issues =  @project.issues.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker ],
             						:conditions => search_filter_clause,
             						:limit  =>  @issue_pages.items_per_page,
             						:offset =>  @issue_pages.current.offset
-            	end
+              end
+              # Export filtered/sorted issues list to CSV
+              def export_issues_csv
+                sort_init 'issues.id', 'desc'
+                sort_update
+                search_filter_init_list_issues
+                @issues =  Issue.find :all, :order => sort_clause,
+            						:include => [ :author, :status, :tracker ],
+            						:conditions => search_filter_clause
+                export = StringIO.new
+                CSV::Writer.generate(export, ',') do |csv|
+                  csv << %w(Id Status Tracker Subject Author Created Updated)
+                  @issues.each do |issue|
+                    csv << [issue.id, issue.status.name, issue.tracker.name, issue.subject, issue.author.display_name, _('(time)', issue.created_on),  _('(time)', issue.updated_on)]
+                  end
+                end
+                export.rewind
+                send_data(export.read,
+                  :type => 'text/csv; charset=utf-8; header=present',
+                  :filename => 'export.csv')
+              end
             	# Add a news to @project
             	def add_news
                 @news = @project.news.build(params[:news])
             		if request.post?
             			@news.author = session[:user] unless session[:user].nil?
             			if @news.save
             				redirect_to :action => 'list_news', :id => @project
             			end
             		end
             	end
             	# Show news list of @project
-            	def list_news
+              def list_news
                 @news_pages, @news = paginate :news, :per_page => 10, :conditions => ["project_id=?", @project.id], :include => :author, :order => "news.created_on DESC"
-            	end
+              end
               def add_file
                 if request.post?
                   # Save the attachment
                   if params[:attachment][:file].size > 0
                     @attachment = @project.versions.find(params[:version_id]).attachments.build(params[:attachment])
                     @attachment.author_id = session[:user].id unless session[:user].nil?
                     if @attachment.save
                       redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                     end
                   end
                 end
                 @versions = @project.versions
               end
               def list_files
                 @versions = @project.versions
               end
-            	# Show changelog of @project
+              # Show changelog of @project
-            	def changelog
+              def changelog
-              @fixed_issues = @project.issues.find(:all,
+                @fixed_issues = @project.issues.find(:all,
-                                                                    :include => [ :fixed_version, :status, :tracker ],
+                                                   :include => [ :fixed_version, :status, :tracker ],
-                                                                    :conditions => [ "issue_statuses.is_closed=? and trackers.is_in_chlog=? and issues.fixed_version_id is not null", true, true]
+                                                   :conditions => [ "issue_statuses.is_closed=? and trackers.is_in_chlog=? and issues.fixed_version_id is not null", true, true]
+                                                  )
-            	end
+              end
             private
             	# Find project of id params[:id]
             	# if not found, redirect to project list
             	# used as a before_filter
             	def find_project
             		@project = Project.find(params[:id])
             		rescue
             			flash[:notice] = 'Project not found.'
             			redirect_to :action => 'list'
             	end
             end

redmine/app/helpers/search_filter_helper.rb +60 -30

@@ -1,55 +1,85
1	# redMine - project management software	1	# redMine - project management software
2	# Copyright (C) 2006 Jean-Philippe Lang	2	# Copyright (C) 2006 Jean-Philippe Lang
3	#	3	#
4	# This program is free software; you can redistribute it and/or	4	# This program is free software; you can redistribute it and/or
5	# modify it under the terms of the GNU General Public License	5	# modify it under the terms of the GNU General Public License
6	# as published by the Free Software Foundation; either version 2	6	# as published by the Free Software Foundation; either version 2
7	# of the License, or (at your option) any later version.	7	# of the License, or (at your option) any later version.
8	#	8	#
9	# This program is distributed in the hope that it will be useful,	9	# This program is distributed in the hope that it will be useful,
10	# but WITHOUT ANY WARRANTY; without even the implied warranty of	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12	# GNU General Public License for more details.	12	# GNU General Public License for more details.
13	#	13	#
14	# You should have received a copy of the GNU General Public License	14	# You should have received a copy of the GNU General Public License
15	# along with this program; if not, write to the Free Software	15	# along with this program; if not, write to the Free Software
16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17		17
18	module SearchFilterHelper	18	module SearchFilterHelper
19		19
20	def search_filter_criteria(~~field~~, options = {})	20	def search_filter_criteria(name, options = {})
21	session[:search_filter] \|\|= {}	21	session[:search_filter] \|\|= {}
22	session[:search_filter][~~field~~] \|\|= ~~options~~	22	session[:search_filter][name] \|\|= {}
23	# session[:search_filter][field][:values] = options[:values] unless options[:values].nil?	23	unless session[:search_filter][name][:options] and session[:search_filter][name][:conditions]
24	# session[:search_filter][field][:label] = options[:label] unless options[:label].nil?	24	session[:search_filter][name][:options] = []
25	end	25	session[:search_filter][name][:conditions] = {}
		26	yield.each { \|c\|
		27	session[:search_filter][name][:options] << [c[0], c[1].to_s]
		28	session[:search_filter][name][:conditions].store(c[1].to_s, c[2])
		29	}
		30	end
		31	end
26		32
27	def search_filter_update	33	def search_filter_update
28	session[:search_filter].each_key {\|field\| session[:search_filter][field][:value] = params[field] }	34	session[:search_filter].each_key {\|field\| session[:search_filter][field][:value] = params[field] }
29	#@search_filter[:value] = params[@search_filter[:field]]	35	end
30	end
31		36
32	def search_filter_clause	37	def search_filter_clause
33	clause = "1=1"	38	clause = ["issues.project_id=?", @project.id]
34	session[:search_filter].each {\|field, criteria\| clause = clause + " AND " + field + "='" + session[:search_filter][field][:value] + "'" unless session[:search_filter][field][:value].nil? \|\| session[:search_filter][field][:value].empty? }	39	session[:search_filter].each { \|k, v\|
35	clause	40	v[:value] \|\|= v[:options][0][1]
36	#@search_filter[:field] + "='" + @search_filter[:value] + "'" unless @search_filter[:value].nil? \|\| @search_filter[:value].empty?	41	if (!v[:conditions][v[:value]][0].empty?)
37	end	42	clause[0] = clause[0] + " AND " + v[:conditions][v[:value]][0]
		43	clause << v[:conditions][v[:value]][1] if !v[:conditions][v[:value]][1].nil?
		44	end
		45	}
		46	clause
		47	end
38		48
39	def search_filter_tag(~~field~~)	49	def search_filter_tag(criteria)
40	option_values = []	50	content_tag("select",
41	#values = eval @search_filter[:values_expr]	51	options_for_select(session[:search_filter][criteria][:options], session[:search_filter][criteria][:value]),
42	option_values = eval session[:search_filter][field][:values]	52	:name => criteria
43
44	content_tag("select",
45	content_tag("option", "[All]", :value => "") +
46	options_from_collection_for_select(option_values,
47	"id",
48	session[:search_filter][field][:label] \|\| "name",
49	session[:search_filter][field][:value].to_i
50	),
51	:name => field
52	)	53	)
53	end	54	end
		55
		56	def search_filter_init_list_issues
		57	search_filter_criteria('status_id') {
		58	[ ["[Open]", "O", ["issue_statuses.is_closed=?", false]],
		59	["[All]", "A", ["", false]]
		60	] + IssueStatus.find(:all).collect {\|s\| [s.name, s.id, ["issues.status_id=?", s.id]] }
		61	}
		62
		63	search_filter_criteria('tracker_id') {
		64	[ ["[All]", "A", ["", false]]
		65	] + Tracker.find(:all).collect {\|s\| [s.name, s.id, ["issues.tracker_id=?", s.id]] }
		66	}
		67
		68	search_filter_criteria('priority_id') {
		69	[ ["[All]", "A", ["", false]]
		70	] + Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect {\|s\| [s.name, s.id, ["issues.priority_id=?", s.id]] }
		71	}
		72
		73	search_filter_criteria('category_id') {
		74	[ ["[All]", "A", ["", false]],
		75	["[None]", "N", ["issues.category_id is null"]]
		76	] + @project.issue_categories.find(:all).collect {\|s\| [s.name, s.id, ["issues.category_id=?", s.id]] }
		77	}
54		78
		79	search_filter_criteria('assigned_to_id') {
		80	[ ["[All]", "A", ["", false]],
		81	["[Nobody]", "N", ["issues.assigned_to_id is null"]]
		82	] + User.find(:all).collect {\|s\| [s.display_name, s.id, ["issues.assigned_to_id=?", s.id]] }
		83	}
		84	end
55	end No newline at end of file	85	end

redmine/app/views/projects/list_issues.rhtml +13 -11

             <h2><%=_('Issues')%></h2>
             <form method="post" class="noborder">
             	<table cellpadding=2>
               <tr>
-                <td><%=_('Status')%>:<br /><%= search_filter_tag("issues.status_id") %></td>
+                <td><%=_('Status')%>:<br /><%= search_filter_tag("status_id") %></td>
-                <td><%=_('Tracker')%>:<br /><%= search_filter_tag("issues.tracker_id") %></td>
+                <td><%=_('Tracker')%>:<br /><%= search_filter_tag("tracker_id") %></td>
-                <td><%=_('Priority')%>:<br /><%= search_filter_tag("issues.priority_id") %></td>
+                <td><%=_('Priority')%>:<br /><%= search_filter_tag("priority_id") %></td>
-                <td><%=_('Category')%>:<br /><%= search_filter_tag("issues.category_id") %></td>
+                <td><%=_('Category')%>:<br /><%= search_filter_tag("category_id") %></td>
-                <td><%=_('Author')%>:<br /><%= search_filter_tag("issues.author_id") %></td>
+                <td><%=_('Assigned to')%>:<br /><%= search_filter_tag("assigned_to_id") %></td>
                 <td valign="bottom">
                   <%= submit_tag _('Apply filter') %>
                   <%= end_form_tag %>
                   <%= start_form_tag %>
                   <%= submit_tag _('Reset') %>
                   <%= end_form_tag %>
                 </td>
               </tr>
-            	</table>
+            </table>
+             &nbsp;
-              &nbsp;
             	<table border="0" cellspacing="1" cellpadding="2" class="listTableContent">
+            	   <tr><td colspan="7" align="right">
+            	   <small><%= link_to 'Export to CSV', :action => 'export_issues_csv', :id => @project.id %></small>
+            	   </td></tr>
             		<tr class="ListHead">
             			<%= sort_header_tag('issues.id', :caption => '#') %>
             			<%= sort_header_tag('issue_statuses.name', :caption => _('Status')) %>
             			<%= sort_header_tag('issues.tracker_id', :caption => _('Tracker')) %>
             			<th><%=_('Subject')%></th>
             			<%= sort_header_tag('users.lastname', :caption => _('Author')) %>
             			<%= sort_header_tag('issues.created_on', :caption => _('Created on')) %>
             			<%= sort_header_tag('issues.updated_on', :caption => _('Last update')) %>
             		</tr>
             		<% for issue in @issues %>
             		<tr bgcolor="#<%= issue.status.html_color %>">
             			<td align="center"><%= link_to issue.long_id, :controller => 'issues', :action => 'show', :id => issue %></td>
             			<td align="center"><%= issue.status.name %></td>
             			<td align="center"><%= issue.tracker.name %></td>
             			<td><%= link_to issue.subject, :controller => 'issues', :action => 'show', :id => issue %></td>
             			<td align="center"><%= issue.author.display_name %></td>
             			<td align="center"><%= format_time(issue.created_on) %></td>
             			<td align="center"><%= format_time(issue.updated_on) %></td>
             		</tr>
             		<% end %>
             	</table>
             	<p>
             	<%= pagination_links_full @issue_pages %>
             	[ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]
-            	</p>
+                </p>
             <p>
             <%= link_to_if_authorized '&#187; ' + _('Report an issue'), :controller => 'projects', :action => 'add_issue', :id => @project %>
             </p>

redmine/app/views/reports/_simple.rhtml +10 -5

             <% col_width = 70 / (@statuses.length+3) %>
             <table border="0" cellspacing="1" cellpadding="2" width="100%">
             <tr>
             <td width="25%"></td>
             <% for status in @statuses %>
               <td align="center" width="<%= col_width %>%" bgcolor="#<%= status.html_color %>"><small><%= status.name %></small></td>
             <% end %>
             <td align="center" width="<%= col_width %>%"><strong><%=_('Open')%></strong></td>
             <td align="center" width="<%= col_width %>%"><strong><%=_('Closed')%></strong></td>
             <td align="center" width="<%= col_width %>%"><strong><%=_('Total')%></strong></td>
             </tr>
             <% for row in rows %>
             <tr style="background-color:#CEE1ED">
               <td><%= link_to row.name, :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
-                                                            "issues.#{field_name}" => row.id %></td>
+                                                            "#{field_name}" => row.id %></td>
               <% for status in @statuses %>
                 <td align="center"><%= link_to (aggregate data, { field_name => row.id, "status_id" => status.id }),
                                                             :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
-                                                            "issues.status_id" => status.id,
+                                                            "status_id" => status.id,
-                                                            "issues.#{field_name}" => row.id %></td>
+                                                            "#{field_name}" => row.id %></td>
               <% end %>
-              <td align="center"><%= aggregate data, { field_name => row.id, "closed" => 0 } %></td>
+              <td align="center"><%= link_to (aggregate data, { field_name => row.id, "closed" => 0 }),
+                                                            :controller => 'projects', :action => 'list_issues', :id => @project,
+                                                            :set_filter => 1,
+                                                            "#{field_name}" => row.id,
+                                                            "status_id" => "O" %></td>
               <td align="center"><%= aggregate data, { field_name => row.id, "closed" => 1 } %></td>
               <td align="center"><%= link_to (aggregate data, { field_name => row.id }),
                                                             :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
-                                                            "issues.#{field_name}" => row.id %></td>
+                                                            "#{field_name}" => row.id,
+                                                            "status_id" => "A" %></td>
             <% end %>
             </tr>
             </table>

redmine/doc/CHANGELOG +8 0

             == redMine changelog
             redMine - project management software
             Copyright (C) 2006  Jean-Philippe Lang
             http://redmine.sourceforge.net/
+            == xx/xx/2006
+            * More filter options in issues list
+            * Issues list exportable to CSV
+            * Fixed: Error on tables creation with PostgreSQL (rev5)
+            * Fixed: SQL error in "issue reports" view with PostgreSQL (rev5)
             == 06/25/2006 - v0.1.0
             * multiple users/multiple projects
             * role based access control
             * issue tracking system
             * fully customizable workflow
             * documents/files repository
             * email notifications on issue creation and update
             * multilanguage support (except for error messages):english, french, spanish
             * online manual in french (unfinished)

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