jro_apps/redmine Commit - r76:da91e5e95a54

query model/controller added...

Jean-Philippe Lang -

r76:da91e5e95a54

parent child

Context file:

r76:da91e5e95a54

Collapse all files

queries/trunk/app/controllers/queries_controller.rb created 644 +55 0

@@ -0,0 +1,55
	1	class QueriesController < ApplicationController
	2	layout 'base'
	3
	4	def index
	5	list
	6	render :action => 'list'
	7	end
	8
	9	# GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
	10	verify :method => :post, :only => [ :destroy, :create, :update ],
	11	:redirect_to => { :action => :list }
	12
	13	def list
	14	@query_pages, @queries = paginate :queries, :per_page => 10
	15	end
	16
	17	def show
	18	@query = Query.find(params[:id])
	19	end
	20
	21	def new
	22	@query = Query.new(params[:query])
	23
	24	params[:fields].each do \|field\|
	25	@query.add_filter(field, params[:operators][field], params[:values][field])
	26	end if params[:fields]
	27
	28	if request.post? and @query.save
	29	flash[:notice] = 'Query was successfully created.'
	30	redirect_to :action => 'list'
	31	end
	32	end
	33
	34	def edit
	35	@query = Query.find(params[:id])
	36
	37	if request.post?
	38	@query.filters = {}
	39	params[:fields].each do \|field\|
	40	@query.add_filter(field, params[:operators][field], params[:values][field])
	41	end if params[:fields]
	42	@query.attributes = params[:query]
	43
	44	if @query.save
	45	flash[:notice] = 'Query was successfully updated.'
	46	redirect_to :action => 'show', :id => @query
	47	end
	48	end
	49	end
	50
	51	def destroy
	52	Query.find(params[:id]).destroy
	53	redirect_to :action => 'list'
	54	end
	55	end

queries/trunk/app/helpers/queries_helper.rb created 644 +2 0

@@ -0,0 +1,2
	1	module QueriesHelper
	2	end

queries/trunk/app/models/query.rb created 644 +123 0

@@ -0,0 +1,123
	1	class Query < ActiveRecord::Base
	2	serialize :filters
	3
	4	validates_presence_of :name
	5
	6	@@operators = { "=" => "Egal",
	7	"!" => "Different",
	8	"o" => "Ouvert",
	9	"c" => "Ferme",
	10	"!*" => "Aucun",
	11	"*" => "Tous",
	12	"<t+" => "Dans moins de",
	13	">t+" => "Dans plus de",
	14	"t+" => "Dans exactement",
	15	"t" => "Aujourd'hui",
	16	">t-" => "Il y a moins de",
	17	"<t-" => "Il y a plus de",
	18	"t-" => "Il y a exactement" }
	19
	20	@@operators_by_filter_type = { :list => [ "=", "!" ],
	21	:list_status => [ "o", "=", "!", "c" ],
	22	:list_optional => [ "=", "!", "!", "" ],
	23	:date => [ "<t+", ">t+", "t+", "t", ">t-", "<t-", "t-" ],
	24	:date_past => [ ">t-", "<t-", "t-", "t" ] }
	25
	26	@@available_filters = { "status_id" => { :type => :list_status, :order => 1,
	27	:values => IssueStatus.find(:all).collect{\|s\| [s.name, s.id.to_s] } },
	28	"tracker_id" => { :type => :list, :order => 2,
	29	:values => Tracker.find(:all).collect{\|s\| [s.name, s.id.to_s] } },
	30	"assigned_to_id" => { :type => :list_optional, :order => 3,
	31	:values => User.find(:all).collect{\|s\| [s.display_name, s.id.to_s] } },
	32	"priority_id" => { :type => :list, :order => 4,
	33	:values => Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect{\|s\| [s.name, s.id.to_s] } },
	34	"created_on" => { :type => :date_past, :order => 5 },
	35	"updated_on" => { :type => :date_past, :order => 6 },
	36	"start_date" => { :type => :date, :order => 7 },
	37	"due_date" => { :type => :date, :order => 8 } }
	38
	39	cattr_accessor :available_filters
	40
	41	def initialize(attributes = nil)
	42	super
	43	self.filters \|\|= { 'status_id' => {:operator => "o"} }
	44	end
	45
	46	def validate
	47	errors.add_to_base "Au moins un critere doit etre selectionne" unless filters && !filters.empty?
	48	filters.each_key do \|field\|
	49	errors.add field.gsub(/\_id$/, ""), "doit etre renseigne" unless
	50	# filter requires one or more values
	51	(values_for(field) and !values_for(field).first.empty?) or
	52	# filter doesn't require any value
	53	["o", "c", "!", "", "t"].include? operator_for(field)
	54	end if filters
	55	end
	56
	57	def add_filter(field, operator, values)
	58	# values must be an array
	59	return unless values and values.is_a? Array
	60	# check if field is defined as an available filter
	61	if @@available_filters.has_key? field
	62	filter_options = @@available_filters[field]
	63	# check if operator is allowed for that filter
	64	if @@operators_by_filter_type[filter_options[:type]].include? operator
	65	filters[field] = {:operator => operator, :values => values }
	66	end
	67	end
	68	end
	69
	70	def has_filter?(field)
	71	filters and filters[field]
	72	end
	73
	74	def operator_for(field)
	75	has_filter?(field) ? filters[field][:operator] : nil
	76	end
	77
	78	def values_for(field)
	79	has_filter?(field) ? filters[field][:values] : nil
	80	end
	81
	82	def statement
	83	sql = "1=1"
	84	filters.each_key do \|field\|
	85	sql = sql + " AND " unless sql.empty?
	86	v = values_for field
	87	case operator_for field
	88	when "="
	89	sql = sql + "issues.#{field} IN (" + v.each(&:to_i).join(",") + ")"
	90	when "!"
	91	sql = sql + "issues.#{field} NOT IN (" + v.each(&:to_i).join(",") + ")"
	92	when "!*"
	93	sql = sql + "issues.#{field} IS NULL"
	94	when "*"
	95	sql = sql + "issues.#{field} IS NOT NULL"
	96	when "o"
	97	sql = sql + "issue_statuses.is_closed=#{connection.quoted_false}" if field == "status_id"
	98	when "c"
	99	sql = sql + "issue_statuses.is_closed=#{connection.quoted_true}" if field == "status_id"
	100	when ">t-"
	101	sql = sql + "issues.#{field} >= '%s'" % connection.quoted_date(Date.today - v.first.to_i)
	102	when "<t-"
	103	sql = sql + "issues.#{field} <= '" + (Date.today - v.first.to_i).strftime("%Y-%m-%d") + "'"
	104	when "t-"
	105	sql = sql + "issues.#{field} = '" + (Date.today - v.first.to_i).strftime("%Y-%m-%d") + "'"
	106	when ">t+"
	107	sql = sql + "issues.#{field} >= '" + (Date.today + v.first.to_i).strftime("%Y-%m-%d") + "'"
	108	when "<t+"
	109	sql = sql + "issues.#{field} <= '" + (Date.today + v.first.to_i).strftime("%Y-%m-%d") + "'"
	110	when "t+"
	111	sql = sql + "issues.#{field} = '" + (Date.today + v.first.to_i).strftime("%Y-%m-%d") + "'"
	112	when "t"
	113	sql = sql + "issues.#{field} = '%s'" % connection.quoted_date(Date.today)
	114	end
	115	end if filters
	116	sql
	117	end
	118
	119	def self.operators_for_select(filter_type)
	120	@@operators_by_filter_type[filter_type].collect {\|o\| [@@operators[o], o]}
	121	end
	122
	123	end

queries/trunk/app/views/queries/_filters.rhtml created 644 +72 0

@@ -0,0 +1,72
	1	<script>
	2
	3	function toggle_filter(field) {
	4	check_box = $('cb_' + field);
	5
	6	if (check_box.checked) {
	7	Element.show("operators[" + field + "]");
	8	toggle_operator(field);
	9	} else {
	10	Element.hide("operators[" + field + "]");
	11	Element.hide("values_div[" + field + "]");
	12	}
	13	}
	14
	15	function toggle_operator(field) {
	16	operator = $("operators[" + field + "]");
	17	switch (operator.value) {
	18	case "!*":
	19	case "*":
	20	case "t":
	21	case "o":
	22	case "c":
	23	Element.hide("values_div[" + field + "]");
	24	break;
	25	default:
	26	Element.show("values_div[" + field + "]");
	27	break;
	28	}
	29	}
	30
	31	function toggle_multi_select(field) {
	32	select = $('values[' + field + '][]');
	33	if (select.multiple == true) {
	34	select.multiple = false;
	35	} else {
	36	select.multiple = true;
	37	}
	38	}
	39
	40	</script>
	41
	42	<fieldset><legend>Filtres</legend>
	43	<table>
	44	<% Query.available_filters.sort{\|a,b\| a[1][:order]<=>b[1][:order]}.each do \|filter\| %>
	45	<% field = filter[0]
	46	options = filter[1] %>
	47	<tr>
	48	<td valign="top" width="200">
	49	<%= check_box_tag 'fields[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %>
	50	<label for="cb_<%= field %>"><%= l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label>
	51	</td>
	52	<td valign="top" width="150">
	53	<%= select_tag "operators[#{field}]", options_for_select(Query.operators_for_select(options[:type]), query.operator_for(field)), :onchange => "toggle_operator('#{field}');", :class => "select-small", :style => "vertical-align: top;" %>
	54	</td>
	55	<td valign="top">
	56	<div id="values_div[<%= field %>]">
	57	<% case options[:type]
	58	when :list, :list_optional, :list_status %>
	59	<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;">
	60	<%= options_for_select options[:values], query.values_for(field) %>
	61	</select>
	62	<%= link_to_function '+', "toggle_multi_select('#{field}');" %>
	63	<% when :date, :date_past %>
	64	<%= text_field_tag "values[#{field}][]", query.values_for(field), :size => 3, :class => "select-small" %> jours
	65	<% end %>
	66	</div>
	67	</td>
	68	</tr>
	69	<script>toggle_filter('<%= field %>');</script>
	70	<% end %>
	71	</table>
	72	</fieldset> No newline at end of file

queries/trunk/app/views/queries/_form.rhtml created 644 +18 0

@@ -0,0 +1,18
	1	<%= error_messages_for 'query' %>
	2
	3	<!--[form:query]-->
	4	<div class="box">
	5
	6	<div class="tabular">
	7	<p><label for="query_name">Name</label>
	8	<%= text_field 'query', 'name', :size => 80 %></p>
	9
	10	<p><label for="query_is_public">Public</label>
	11	<%= check_box 'query', 'is_public' %></p>
	12	</div>
	13
	14	<%= render :partial => 'filters', :locals => {:query => query}%>
	15
	16	</div>
	17	<!--[eoform:query]-->
	18

queries/trunk/app/views/queries/edit.rhtml created 644 +8 0

@@ -0,0 +1,8
	1	<h1>Editing query</h1>
	2
	3	<%= start_form_tag :action => 'edit', :id => @query %>
	4	<%= render :partial => 'form', :locals => {:query => @query} %>
	5	<%= submit_tag 'Edit' %>
	6	<%= end_form_tag %>
	7
	8	<%= debug @query.statement %> No newline at end of file

queries/trunk/app/views/queries/list.rhtml created 644 +27 0

@@ -0,0 +1,27
	1	<h1>Listing queries</h1>
	2
	3	<table>
	4	<tr>
	5	<% for column in Query.content_columns %>
	6	<th><%= column.human_name %></th>
	7	<% end %>
	8	</tr>
	9
	10	<% for query in @queries %>
	11	<tr>
	12	<% for column in Query.content_columns %>
	13	<td><%=h query.send(column.name) %></td>
	14	<% end %>
	15	<td><%= link_to 'Show', :action => 'show', :id => query %></td>
	16	<td><%= link_to 'Edit', :action => 'edit', :id => query %></td>
	17	<td><%= link_to 'Destroy', { :action => 'destroy', :id => query }, :confirm => 'Are you sure?', :post => true %></td>
	18	</tr>
	19	<% end %>
	20	</table>
	21
	22	<%= link_to 'Previous page', { :page => @query_pages.current.previous } if @query_pages.current.previous %>
	23	<%= link_to 'Next page', { :page => @query_pages.current.next } if @query_pages.current.next %>
	24
	25	<br />
	26
	27	<%= link_to 'New query', :action => 'new' %>

queries/trunk/app/views/queries/new.rhtml created 644 +9 0

@@ -0,0 +1,9
	1	<h1>New query</h1>
	2
	3	<%= start_form_tag :action => 'new' %>
	4	<%= render :partial => 'form', :locals => {:query => @query} %>
	5	<%= submit_tag "Create" %>
	6	<%= end_form_tag %>
	7
	8	<%= debug @query %>
	9	<%= debug params %>

queries/trunk/app/views/queries/show.rhtml created 644 +8 0

@@ -0,0 +1,8
	1	<% for column in Query.content_columns %>
	2	<p>
	3	<b><%= column.human_name %>:</b> <%=h @query.send(column.name) %>
	4	</p>
	5	<% end %>
	6
	7	<%= link_to 'Edit', :action => 'edit', :id => @query %> \|
	8	<%= link_to 'Back', :action => 'list' %>

queries/trunk/app/controllers/projects_controller.rb +6 -4

             # 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', :except => :export_issues_pdf
               before_filter :find_project, :authorize, :except => [ :index, :list, :add ]
               before_filter :require_admin, :only => [ :add, :destroy ]
               helper :sort
               include SortHelper
               helper :search_filter
               include SearchFilterHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               helper IssuesHelper
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               # Lists public projects
               def list
                 sort_init 'name', 'asc'
                 sort_update
                 @project_count = Project.count(["is_public=?", true])
                 @project_pages = Paginator.new self, @project_count,
 ,
             								@params['page']
                 @projects = Project.find :all, :order => sort_clause,
             						:conditions => ["is_public=?", true],
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
                 render :action => "list", :layout => false if request.xhr?
               end
               # Add a new project
               def add
                 @custom_fields = IssueCustomField.find(:all)
                 @root_projects = Project.find(:all, :conditions => "parent_id is null")
                 @project = Project.new(params[:project])
                 if request.get?
                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
                 else
                   @project.custom_fields = CustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids]
                   @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                   @project.custom_values = @custom_values
                   if @project.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'admin', :action => 'projects'
             	  end
                 end
               end
               # Show @project
               def show
                 @custom_values = @project.custom_values.find(:all, :include => :custom_field)
                 @members = @project.members.find(:all, :include => [:user, :role])
                 @subprojects = @project.children if @project.children_count > 0
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "news.created_on DESC")
                 @trackers = Tracker.find(:all)
               end
               def settings
                 @root_projects = Project::find(:all, :conditions => ["parent_id is null and id <> ?", @project.id])
                 @custom_fields = IssueCustomField::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 }
                 @custom_values ||= ProjectCustomField.find(:all).collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
               end
               # Edit @project
               def edit
                 if request.post?
                   @project.custom_fields = IssueCustomField.find(@params[:custom_field_ids]) if @params[:custom_field_ids]
                   if params[:custom_fields]
                     @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
                     @project.custom_values = @custom_values
                   end
                   if @project.update_attributes(params[:project])
                     flash[:notice] = l(:notice_successful_update)
                     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
                     flash[:notice] = l(:notice_successful_create)
                     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
               	  flash[:notice] = l(:notice_successful_create)
                   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] = l(:notice_successful_create)
                     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 = self.logged_in_user.id if self.logged_in_user
                   end
                   if @document.save
                     flash[:notice] = l(:notice_successful_create)
                     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
                 @tracker = Tracker.find(params[:tracker_id])
                 @priorities = Enumeration::get_values('IPRI')
                 @issue = Issue.new(:project => @project, :tracker => @tracker)
                 if request.get?
                   @issue.start_date = Date.today
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) }
                 else
                   @issue.attributes = params[:issue]
                   @issue.author_id = self.logged_in_user.id if self.logged_in_user
                   # Multiple file upload
                   params[:attachments].each { |a|
                     @attachment = @issue.attachments.build(:file => a, :author => self.logged_in_user) unless a.size == 0
                   } if params[:attachments] and params[:attachments].is_a? Array
                   @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                   @issue.custom_values = @custom_values
                   if @issue.save
                     flash[:notice] = l(:notice_successful_create)
                     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 filtered/sorted issues list of @project
               def list_issues
                 sort_init 'issues.id', 'desc'
                 sort_update
-                search_filter_init_list_issues
+                @query = Query.new
-                search_filter_update if params[:set_filter]
+                params[:fields].each do |field|
+                  @query.add_filter(field, params[:operators][field], params[:values][field])
+                end if params[:fields]
                 @results_per_page_options = [ 15, 25, 50, 100 ]
                 if params[:per_page] and @results_per_page_options.include? params[:per_page].to_i
                   @results_per_page = params[:per_page].to_i
                   session[:results_per_page] = @results_per_page
                 else
                   @results_per_page = session[:results_per_page] || 25
                 end
-                @issue_count = Issue.count(:include => [:status, :project], :conditions => search_filter_clause)
+                @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
                 @issue_pages = Paginator.new self, @issue_count, @results_per_page, @params['page']
                 @issues = Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :project ],
-            						:conditions => search_filter_clause,
+            						:conditions => @query.statement,
             						:limit  =>  @issue_pages.items_per_page,
             						:offset =>  @issue_pages.current.offset
                 render :layout => false if request.xhr?
               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, :project, :custom_values ],
             						:conditions => search_filter_clause
                 ic = Iconv.new('ISO-8859-1', 'UTF-8')
                 export = StringIO.new
                 CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
                   # csv header fields
                   headers = [ "#", l(:field_status), l(:field_tracker), l(:field_subject), l(:field_author), l(:field_created_on), l(:field_updated_on) ]
                   for custom_field in @project.all_custom_fields
                     headers << custom_field.name
                   end
                   csv << headers.collect {|c| ic.iconv(c) }
                   # csv lines
                   @issues.each do |issue|
                     fields = [issue.id, issue.status.name, issue.tracker.name, issue.subject, issue.author.display_name, l_datetime(issue.created_on),  l_datetime(issue.updated_on)]
                     for custom_field in @project.all_custom_fields
                       fields << (show_value issue.custom_value_for(custom_field))
                     end
                     csv << fields.collect {|c| ic.iconv(c.to_s) }
                   end
                 end
                 export.rewind
                 send_data(export.read, :type => 'text/csv; header=present', :filename => 'export.csv')
               end
               # Export filtered/sorted issues to PDF
               def export_issues_pdf
                 sort_init 'issues.id', 'desc'
                 sort_update
                 search_filter_init_list_issues
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :project, :custom_values ],
             						:conditions => search_filter_clause
                 @options_for_rfpdf ||= {}
                 @options_for_rfpdf[:file_name] = "export.pdf"
               end
               def move_issues
                 @issues = @project.issues.find(params[:issue_ids]) if params[:issue_ids]
                 redirect_to :action => 'list_issues', :id => @project and return unless @issues
                 @projects = []
                 # find projects to which the user is allowed to move the issue
                 @logged_in_user.memberships.each {|m| @projects << m.project if Permission.allowed_to_role("projects/move_issues", m.role_id)}
                 # issue can be moved to any tracker
                 @trackers = Tracker.find(:all)
                 if request.post? and params[:new_project_id] and params[:new_tracker_id]
                   new_project = Project.find(params[:new_project_id])
                   new_tracker = Tracker.find(params[:new_tracker_id])
                   @issues.each { |i|
                     # category is project dependent
                     i.category = nil unless i.project_id == new_project.id
                     # move the issue
                     i.project = new_project
                     i.tracker = new_tracker
                     i.save
                   }
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'list_issues', :id => @project
                 end
               end
               # Add a news to @project
               def add_news
                 @news = News.new(:project => @project)
                 if request.post?
                   @news.attributes = params[:news]
                   @news.author_id = self.logged_in_user.id if self.logged_in_user
                   if @news.save
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list_news', :id => @project
                   end
                 end
               end
               # Show news list of @project
               def list_news
                 @news_pages, @news = paginate :news, :per_page => 10, :conditions => ["project_id=?", @project.id], :include => :author, :order => "news.created_on DESC"
                 render :action => "list_news", :layout => false if request.xhr?
               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 = self.logged_in_user.id if self.logged_in_user
                     if @attachment.save
                       flash[:notice] = l(:notice_successful_create)
                       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 for @project
               def changelog
                 @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true])
                 if request.get?
                   @selected_tracker_ids = @trackers.collect {|t| t.id.to_s }
                 else
                   @selected_tracker_ids = params[:tracker_ids].collect { |id| id.to_i.to_s } if params[:tracker_ids] and params[:tracker_ids].is_a? Array
                 end
                 @selected_tracker_ids ||= []
                 @fixed_issues = @project.issues.find(:all,
                   :include => [ :fixed_version, :status, :tracker ],
                   :conditions => [ "issue_statuses.is_closed=? and issues.tracker_id in (#{@selected_tracker_ids.join(',')}) and issues.fixed_version_id is not null", true],
                   :order => "versions.effective_date DESC, issues.id DESC"
                 ) unless @selected_tracker_ids.empty?
                 @fixed_issues ||= []
               end
               def activity
                 if params[:year] and params[:year].to_i > 1900
                   @year = params[:year].to_i
                   if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
                     @month = params[:month].to_i
                   end
                 end
                 @year ||= Date.today.year
                 @month ||= Date.today.month
                 @date_from = Date.civil(@year, @month, 1)
                 @date_to = (@date_from >> 1)-1
                 @events_by_day = {}
                 unless params[:show_issues] == "0"
                   @project.issues.find(:all, :include => [:author, :status], :conditions => ["issues.created_on>=? and issues.created_on<=?", @date_from, @date_to] ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_issues = 1
                 end
                 unless params[:show_news] == "0"
                   @project.news.find(:all, :conditions => ["news.created_on>=? and news.created_on<=?", @date_from, @date_to] ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_news = 1
                 end
                 unless params[:show_files] == "0"
                   Attachment.find(:all, :joins => "LEFT JOIN versions ON versions.id = attachments.container_id", :conditions => ["attachments.container_type='Version' and versions.project_id=? and attachments.created_on>=? and attachments.created_on<=?", @project.id, @date_from, @date_to] ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_files = 1
                 end
                 unless params[:show_documents] == "0"
                   Attachment.find(:all, :joins => "LEFT JOIN documents ON documents.id = attachments.container_id", :conditions => ["attachments.container_type='Document' and documents.project_id=? and attachments.created_on>=? and attachments.created_on<=?", @project.id, @date_from, @date_to] ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_documents = 1
                 end
                 render :layout => false if request.xhr?
               end
               def calendar
                 if params[:year] and params[:year].to_i > 1900
                   @year = params[:year].to_i
                   if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
                     @month = params[:month].to_i
                   end
                 end
                 @year ||= Date.today.year
                 @month ||= Date.today.month
                 @date_from = Date.civil(@year, @month, 1)
                 @date_to = (@date_from >> 1)-1
                 # start on monday
                 @date_from = @date_from - (@date_from.cwday-1)
                 # finish on sunday
                 @date_to = @date_to + (7-@date_to.cwday)
                 @issues = @project.issues.find(:all, :include => :tracker, :conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?))", @date_from, @date_to, @date_from, @date_to])
                 render :layout => false if request.xhr?
               end
               def gantt
                 if params[:year] and params[:year].to_i >0
                   @year_from = params[:year].to_i
                   if params[:month] and params[:month].to_i >=1 and params[:month].to_i <= 12
                     @month_from = params[:month].to_i
                   else
                     @month_from = 1
                   end
                 else
                   @month_from ||= (Date.today << 1).month
                   @year_from ||= (Date.today << 1).year
                 end
                 @zoom = (params[:zoom].to_i > 0 and params[:zoom].to_i < 5) ? params[:zoom].to_i : 2
                 @months = (params[:months].to_i > 0 and params[:months].to_i < 25) ? params[:months].to_i : 6
                 @date_from = Date.civil(@year_from, @month_from, 1)
                 @date_to = (@date_from >> @months) - 1
                 @issues = @project.issues.find(:all, :order => "start_date, due_date", :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null)", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to])
                 if params[:output]=='pdf'
                   @options_for_rfpdf ||= {}
                   @options_for_rfpdf[:file_name] = "gantt.pdf"
                   render :template => "projects/gantt.rfpdf", :layout => false
                 else
                   render :template => "projects/gantt.rhtml"
                 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])
                 @html_title = @project.name
               rescue
                 redirect_to :action => 'list'
               end
             end

queries/trunk/app/views/projects/list_issues.rhtml +4 -20

             <h2><%=l(:label_issue_plural)%></h2>
             <div class="topright">
             <small>
             <%= l(:label_export_to) %>&nbsp;
             <%= link_to 'CSV', :action => 'export_issues_csv', :id => @project %>,
             <%= link_to 'PDF', :action => 'export_issues_pdf', :id => @project %>
             </small>
             </div>
+            <div>
             <%= start_form_tag :action => 'list_issues' %>
-            <table cellpadding=2>
+            <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
-              <tr>
+            <%= submit_tag l(:button_apply), :class => "button-small" %>
-                <td valign="bottom"><small><%=l(:field_status)%>:</small><br /><%= search_filter_tag 'status_id', :class => 'select-small' %></td>
-                <td valign="bottom"><small><%=l(:field_tracker)%>:</small><br /><%= search_filter_tag 'tracker_id', :class => 'select-small' %></td>
-                <td valign="bottom"><small><%=l(:field_priority)%>:</small><br /><%= search_filter_tag 'priority_id', :class => 'select-small' %></td>
-                <td valign="bottom"><small><%=l(:field_category)%>:</small><br /><%= search_filter_tag 'category_id', :class => 'select-small' %></td>
-                <td valign="bottom"><small><%=l(:field_fixed_version)%>:</small><br /><%= search_filter_tag 'fixed_version_id', :class => 'select-small' %></td>
-                <td valign="bottom"><small><%=l(:field_author)%>:</small><br /><%= search_filter_tag 'author_id', :class => 'select-small' %></td>
-                <td valign="bottom"><small><%=l(:field_assigned_to)%>:</small><br /><%= search_filter_tag 'assigned_to_id', :class => 'select-small' %></td>
-                <td valign="bottom"><small><%=l(:label_subproject_plural)%>:</small><br /><%= search_filter_tag 'subproject_id', :class => 'select-small' %></td>
-                <td valign="bottom">
-                  <%= hidden_field_tag 'set_filter', 1 %>
-                  <%= submit_tag l(:button_apply), :class => 'button-small' %>
-                </td>
-                <td valign="bottom">
-                  <%= link_to l(:button_clear), :action => 'list_issues', :id => @project, :set_filter => 1 %>
-                </td>
-              </tr>
-            </table>
             <%= end_form_tag %>
+            </div>
              &nbsp;
             <table class="listTableContent">
                 <tr>
                 <td colspan="6" align="left"><small><%= check_all_links 'issues_form' %></small></td>
                 <td colspan="2" align="right">
                     <small><%= l(:label_per_page) %>:</small>
                     <%= start_form_tag %>
                     <%= select_tag 'per_page', options_for_select(@results_per_page_options, @results_per_page), :class => 'select-small'%>
                     <%= submit_tag l(:button_apply), :class => 'button-small'%>
                     <%= end_form_tag %>
                 </td>
                 </tr>
             </table>
             <%= start_form_tag({:controller => 'projects', :action => 'move_issues', :id => @project}, :id => 'issues_form' ) %>
             <table class="listTableContent">
                 <tr class="ListHead">
                     <td></td>
             		<%= sort_header_tag('issues.id', :caption => '#') %>
             		<%= sort_header_tag('issue_statuses.name', :caption => l(:field_status)) %>
             		<%= sort_header_tag('issues.tracker_id', :caption => l(:field_tracker)) %>
             		<th><%=l(:field_subject)%></th>
             		<%= sort_header_tag('users.lastname', :caption => l(:field_author)) %>
             		<%= sort_header_tag('issues.created_on', :caption => l(:field_created_on)) %>
             		<%= sort_header_tag('issues.updated_on', :caption => l(:field_updated_on)) %>
             	</tr>
             	<% for issue in @issues %>
             	<tr class="<%= cycle("odd", "even") %>">
             	    <td width="15"><%= check_box_tag "issue_ids[]", issue.id %></td>
             		<td align="center"><%= link_to issue.long_id, :controller => 'issues', :action => 'show', :id => issue %></td>
             		<td align="center" style="font-weight:bold;color:#<%= issue.status.html_color %>;"><%= issue.status.name %></font></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>
             <%= submit_tag l(:button_move) %>
             <%= end_form_tag %>

queries/trunk/public/stylesheets/application.css +1 -1

             /* andreas08 - an open source xhtml/css website layout by Andreas Viklund - http://andreasviklund.com . Free to use in any way and for any purpose as long as the proper credits are given to the original designer. Version: 1.0, November 28, 2005 */
             /* Edited by Jean-Philippe Lang *>
             /**************** Body and tag styles ****************/
             #header * {margin:0; padding:0;}
             p, ul, ol, li {margin:0; padding:0;}
             body{
             font:76% Verdana,Tahoma,Arial,sans-serif;
             line-height:1.4em;
             text-align:center;
             color:#303030;
             background:#e8eaec;
             margin:0;
             }
             a{
             color:#467aa7;
             font-weight:bold;
             text-decoration:none;
             background-color:inherit;
             }
             a:hover{color:#2a5a8a; text-decoration:none; background-color:inherit;}
             a img{border:none;}
             p{padding:0 0 1em 0;}
             p form{margin-top:0; margin-bottom:20px;}
             img.left,img.center,img.right{padding:4px; border:1px solid #a0a0a0;}
             img.left{float:left; margin:0 12px 5px 0;}
             img.center{display:block; margin:0 auto 5px auto;}
             img.right{float:right; margin:0 0 5px 12px;}
             /**************** Header and navigation styles ****************/
             #container{
             width:100%;
             min-width: 800px;
             margin:0;
             padding:0;
             text-align:left;
             background:#ffffff;
             color:#303030;
             }
             #header{
             height:4.5em;
             /*width:758px;*/
             margin:0;
             background:#467aa7;
             color:#ffffff;
             margin-bottom:1px;
             }
             #header h1{
             padding:10px 0 0 20px;
             font-size:2em;
             background-color:inherit;
             color:#fff; /*rgb(152, 26, 33);*/
             letter-spacing:-1px;
             font-weight:bold;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #header h2{
             margin:3px 0 0 40px;
             font-size:1.5em;
             background-color:inherit;
             color:#f0f2f4;
             letter-spacing:-1px;
             font-weight:normal;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #navigation{
             height:2.2em;
             line-height:2.2em;
             /*width:758px;*/
             margin:0;
             background:#578bb8;
             color:#ffffff;
             }
             #navigation li{
             float:left;
             list-style-type:none;
             border-right:1px solid #ffffff;
             white-space:nowrap;
             }
             #navigation li.right {
              float:right;
             list-style-type:none;
             border-right:0;
             border-left:1px solid #ffffff;
             white-space:nowrap;
             }
             #navigation li a{
             display:block;
             padding:0px 10px 0px 22px;
             font-size:0.8em;
             font-weight:normal;
             /*text-transform:uppercase;*/
             text-decoration:none;
             background-color:inherit;
             color: #ffffff;
             }
             * html #navigation a {width:1%;}
             #navigation .selected,#navigation a:hover{
             color:#ffffff;
             text-decoration:none;
             background-color: #80b0da;
             }
             /**************** Icons links *******************/
             .picHome {	background: url(../images/home.png) no-repeat 4px 50%; }
             .picUser {	background: url(../images/user.png) no-repeat 4px 50%; }
             .picUserPage {	background: url(../images/user_page.png) no-repeat 4px 50%; }
             .picAdmin {	background: url(../images/admin.png) no-repeat 4px 50%; }
             .picProject { background: url(../images/projects.png) no-repeat 4px 50%; }
             .picLogout { background: url(../images/logout.png) no-repeat 4px 50%; }
             .picHelp { background: url(../images/help.png) no-repeat 4px 50%; }
             /**************** Content styles ****************/
             html>body #content {
             height: auto;
             min-height: 500px;
             }
             #content{
             /*float:right;*/
             /*width:530px;*/
             width: auto;
             height:500px;
             font-size:0.9em;
             padding:20px 10px 10px 20px;
             /*position: absolute;*/
             margin-left: 120px;
             border-left: 1px dashed #c0c0c0;
             }
             #content h2{
             display:block;
             margin:0 0 16px 0;
             font-size:1.7em;
             font-weight:normal;
             letter-spacing:-1px;
             color:#606060;
             background-color:inherit;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #content h2 a{font-weight:normal;}
             #content h3{margin:0 0 12px 0; font-size:1.4em;color:#707070;font-family: Trebuchet MS,Georgia,"Times New Roman",serif;}
             #content a:hover,#subcontent a:hover{text-decoration:underline;}
             #content ul,#content ol{margin:0 5px 16px 35px;}
             #content dl{margin:0 5px 10px 25px;}
             #content dt{font-weight:bold; margin-bottom:5px;}
             #content dd{margin:0 0 10px 15px;}
             /***********************************************/
             /*
             form{
             	padding:15px;
             	margin:0 0 20px 0;
             	border:1px solid #c0c0c0;
             	background-color:#CEE1ED;
             	width:600px;
             }
             */
             form {
             	display: inline;
             }
             .noborder {
             	border:0px;
             	background-color:#fff;
             	width:100%;
             }
             textarea {
                 padding:0;
                 margin:0;
             }
             blockquote {
                 padding-left: 6px;
                 border-left: 2px solid #ccc;
             }
             input {
             	vertical-align: middle;
             }
             input.button-small
             {
                 font-size: 0.8em;
             }
             select {
             	vertical-align: middle;
             }
-            select.select-small
+            .select-small
             {
                border: 1px solid #7F9DB9;
                padding: 1px;
                font-size: 0.8em;
             }
             .active-filter
             {
               background-color: #F9FA9E;
             }
             label {
             	font-weight: bold;
             	font-size: 1em;
             }
             fieldset {
                 border:1px solid #7F9DB9;
                 padding: 6px;
             }
             legend {
                 color: #505050;
             }
             .required {
             	color: #bb0000;
             }
             table.listTableContent {
             	border:1px solid #578bb8;
             	width:99%;
             	border-collapse: collapse;
             }
             table.listTableContent td {
             	padding:2px;
             }
             tr.ListHead {
             	background-color:#467aa7;
             	color:#FFFFFF;
             	text-align:center;
             }
             tr.ListHead a {
             	color:#FFFFFF;
             	text-decoration:underline;
             }
             .odd {
             	background-color:#f0f1f2;
             }
             .even {
             	background-color: #fff;
             }
             table.reportTableContent {
             	border:1px solid #c0c0c0;
             	width:99%;
             	border-collapse: collapse;
             }
             table.reportTableContent td {
             	padding:2px;
             }
             table.calenderTable {
             	border:1px solid #578bb8;
             	width:99%;
             	border-collapse: collapse;
             }
             table.calenderTable td {
             	border:1px solid #578bb8;
             }
             hr { border:none; border-bottom: dotted 1px #c0c0c0; }
             /**************** Sidebar styles ****************/
             #subcontent{
             position: absolute;
             left: 0px;
             width:110px;
             padding:20px 20px 10px 5px;
             }
             #subcontent h2{
             display:block;
             margin:0 0 5px 0;
             font-size:1.0em;
             font-weight:bold;
             text-align:left;
             color:#606060;
             background-color:inherit;
             font-family: Trebuchet MS,Georgia,"Times New Roman",serif;
             }
             #subcontent p{margin:0 0 16px 0; font-size:0.9em;}
             /**************** Menublock styles ****************/
             .menublock{margin:0 0 20px 8px; font-size:0.8em;}
             .menublock li{list-style:none; display:block; padding:1px; margin-bottom:0px;}
             .menublock li a{font-weight:bold; text-decoration:none;}
             .menublock li a:hover{text-decoration:none;}
             .menublock li ul{margin:0; font-size:1em; font-weight:normal;}
             .menublock li ul li{margin-bottom:0;}
             .menublock li ul a{font-weight:normal;}
             /**************** Searchbar styles ****************/
             #searchbar{margin:0 0 20px 0;}
             #searchbar form fieldset{margin-left:10px; border:0 solid;}
             #searchbar #s{
             height:1.2em;
             width:110px;
             margin:0 5px 0 0;
             border:1px solid #a0a0a0;
             }
             #searchbar #searchbutton{
             width:auto;
             padding:0 1px;
             border:1px solid #808080;
             font-size:0.9em;
             text-align:center;
             }
             /**************** Footer styles ****************/
             #footer{
             clear:both;
             /*width:758px;*/
             padding:5px 0;
             margin:0;
             font-size:0.9em;
             color:#f0f0f0;
             background:#467aa7;
             }
             #footer p{padding:0; margin:0; text-align:center;}
             #footer a{color:#f0f0f0; background-color:inherit; font-weight:bold;}
             #footer a:hover{color:#ffffff; background-color:inherit; text-decoration: underline;}
             /**************** Misc classes and styles ****************/
             .splitcontentleft{float:left; width:49%;}
             .splitcontentright{float:right; width:49%;}
             .clear{clear:both;}
             .small{font-size:0.8em;line-height:1.4em;padding:0 0 0 0;}
             .hide{display:none;}
             .textcenter{text-align:center;}
             .textright{text-align:right;}
             .important{color:#f02025; background-color:inherit; font-weight:bold;}
             .box{
             margin:0 0 20px 0;
             padding:10px;
             border:1px solid #c0c0c0;
             background-color:#fafbfc;
             color:#505050;
             line-height:1.5em;
             }
             a.close-icon {
             display:block;
             margin-top:3px;
             overflow:hidden;
             width:12px;
             height:12px;
             background-repeat: no-repeat;
             cursor:hand;
             cursor:pointer;
             background-image:url('../images/close.png');
             }
             a.close-icon:hover {
             background-image:url('../images/close_hl.png');
             }
             .rightbox{
             background: #fafbfc;
             border: 1px solid #c0c0c0;
             float: right;
             padding: 8px;
             position: relative;
             margin: 0 5px 5px;
             }
             .layout-active {
             background: #ECF3E1;
             }
             .block-receiver {
             border:1px dashed #c0c0c0;
             margin-bottom: 20px;
             padding: 15px 0 15px 0;
             }
             .mypage-box {
             margin:0 0 20px 0;
             color:#505050;
             line-height:1.5em;
             }
             .handle {
             cursor: move;
             }
             .topright{
             position: absolute;
             right: 25px;
             top: 100px;
             }
             .login {
             width: 50%;
             text-align: left;
             }
             img.calendar-trigger {
                 cursor: pointer;
                 vertical-align: middle;
                 margin-left: 4px;
             }
             #history h4 {
                 font-size: 1em;
                 margin-bottom: 12px;
                 margin-top: 20px;
                 font-weight: normal;
                 border-bottom: dotted 1px #c0c0c0;
             }
             #history p {
                 margin-left: 34px;
             }
             /***** CSS FORM ******/
             .tabular p{
             margin: 0;
             padding: 5px 0 8px 0;
             padding-left: 180px; /*width of left column containing the label elements*/
             height: 1%;
             }
             .tabular label{
             font-weight: bold;
             float: left;
             margin-left: -180px; /*width of left column*/
             width: 175px; /*width of labels. Should be smaller than left column to create some right
             margin*/
             }
             .error {
             color: #cc0000;
             }
             /*.threepxfix class below:
             Targets IE6- ONLY. Adds 3 pixel indent for multi-line form contents.
             to account for 3 pixel bug: http://www.positioniseverything.net/explorer/threepxtest.html
             */
             * html .threepxfix{
             margin-left: 3px;
             }

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