jro_apps/redmine Commit - r1296:287d86e36325

Queries can be marked as 'For all projects'. Such queries will be available on all projects and on the global issue list (#897, closes #671)....

Jean-Philippe Lang -

r1296:287d86e36325

parent child

Context file:

r1296:287d86e36325

Collapse all files

test/functional/queries_controller_test.rb created 644 +185 0

@@ -0,0 +1,185
	1	# redMine - project management software
	2	# Copyright (C) 2006-2008 Jean-Philippe Lang
	3	#
	4	# This program is free software; you can redistribute it and/or
	5	# modify it under the terms of the GNU General Public License
	6	# as published by the Free Software Foundation; either version 2
	7	# of the License, or (at your option) any later version.
	8	#
	9	# This program is distributed in the hope that it will be useful,
	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	12	# GNU General Public License for more details.
	13	#
	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
	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	17
	18	require File.dirname(__FILE__) + '/../test_helper'
	19	require 'queries_controller'
	20
	21	# Re-raise errors caught by the controller.
	22	class QueriesController; def rescue_action(e) raise e end; end
	23
	24	class QueriesControllerTest < Test::Unit::TestCase
	25	fixtures :projects, :users, :members, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :queries
	26
	27	def setup
	28	@controller = QueriesController.new
	29	@request = ActionController::TestRequest.new
	30	@response = ActionController::TestResponse.new
	31	User.current = nil
	32	end
	33
	34	def test_get_new
	35	@request.session[:user_id] = 2
	36	get :new, :project_id => 1
	37	assert_response :success
	38	assert_template 'new'
	39	assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
	40	:name => 'query[is_public]',
	41	:checked => nil }
	42	assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
	43	:name => 'query_is_for_all',
	44	:checked => nil,
	45	:disabled => nil }
	46	end
	47
	48	def test_new_project_public_query
	49	@request.session[:user_id] = 2
	50	post :new,
	51	:project_id => 'ecookbook',
	52	:confirm => '1',
	53	:default_columns => '1',
	54	:fields => ["status_id", "assigned_to_id"],
	55	:operators => {"assigned_to_id" => "=", "status_id" => "o"},
	56	:values => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
	57	:query => {"name" => "test_new_project_public_query", "is_public" => "1"},
	58	:column_names => ["", "tracker", "status", "priority", "subject", "updated_on", "category"]
	59
	60	q = Query.find_by_name('test_new_project_public_query')
	61	assert_redirected_to :controller => 'issues', :action => 'index', :query_id => q
	62	assert q.is_public?
	63	assert q.has_default_columns?
	64	assert q.valid?
	65	end
	66
	67	def test_new_project_private_query
	68	@request.session[:user_id] = 3
	69	post :new,
	70	:project_id => 'ecookbook',
	71	:confirm => '1',
	72	:default_columns => '1',
	73	:fields => ["status_id", "assigned_to_id"],
	74	:operators => {"assigned_to_id" => "=", "status_id" => "o"},
	75	:values => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
	76	:query => {"name" => "test_new_project_private_query", "is_public" => "1"},
	77	:column_names => ["", "tracker", "status", "priority", "subject", "updated_on", "category"]
	78
	79	q = Query.find_by_name('test_new_project_private_query')
	80	assert_redirected_to :controller => 'issues', :action => 'index', :query_id => q
	81	assert !q.is_public?
	82	assert q.has_default_columns?
	83	assert q.valid?
	84	end
	85
	86	def test_get_edit_global_public_query
	87	@request.session[:user_id] = 1
	88	get :edit, :id => 4
	89	assert_response :success
	90	assert_template 'edit'
	91	assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
	92	:name => 'query[is_public]',
	93	:checked => 'checked' }
	94	assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
	95	:name => 'query_is_for_all',
	96	:checked => 'checked',
	97	:disabled => 'disabled' }
	98	end
	99
	100	def test_edit_global_public_query
	101	@request.session[:user_id] = 1
	102	post :edit,
	103	:id => 4,
	104	:confirm => '1',
	105	:default_columns => '1',
	106	:fields => ["status_id", "assigned_to_id"],
	107	:operators => {"assigned_to_id" => "=", "status_id" => "o"},
	108	:values => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
	109	:query => {"name" => "test_edit_global_public_query", "is_public" => "1"},
	110	:column_names => ["", "tracker", "status", "priority", "subject", "updated_on", "category"]
	111
	112	assert_redirected_to :controller => 'issues', :action => 'index', :query_id => 4
	113	q = Query.find_by_name('test_edit_global_public_query')
	114	assert q.is_public?
	115	assert q.has_default_columns?
	116	assert q.valid?
	117	end
	118
	119	def test_get_edit_global_private_query
	120	@request.session[:user_id] = 3
	121	get :edit, :id => 3
	122	assert_response :success
	123	assert_template 'edit'
	124	assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox',
	125	:name => 'query[is_public]' }
	126	assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
	127	:name => 'query_is_for_all',
	128	:checked => 'checked',
	129	:disabled => 'disabled' }
	130	end
	131
	132	def test_edit_global_private_query
	133	@request.session[:user_id] = 3
	134	post :edit,
	135	:id => 3,
	136	:confirm => '1',
	137	:default_columns => '1',
	138	:fields => ["status_id", "assigned_to_id"],
	139	:operators => {"assigned_to_id" => "=", "status_id" => "o"},
	140	:values => { "assigned_to_id" => ["me"], "status_id" => ["1"]},
	141	:query => {"name" => "test_edit_global_private_query", "is_public" => "1"},
	142	:column_names => ["", "tracker", "status", "priority", "subject", "updated_on", "category"]
	143
	144	assert_redirected_to :controller => 'issues', :action => 'index', :query_id => 3
	145	q = Query.find_by_name('test_edit_global_private_query')
	146	assert !q.is_public?
	147	assert q.has_default_columns?
	148	assert q.valid?
	149	end
	150
	151	def test_get_edit_project_private_query
	152	@request.session[:user_id] = 3
	153	get :edit, :id => 2
	154	assert_response :success
	155	assert_template 'edit'
	156	assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox',
	157	:name => 'query[is_public]' }
	158	assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
	159	:name => 'query_is_for_all',
	160	:checked => nil,
	161	:disabled => nil }
	162	end
	163
	164	def test_get_edit_project_public_query
	165	@request.session[:user_id] = 2
	166	get :edit, :id => 1
	167	assert_response :success
	168	assert_template 'edit'
	169	assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
	170	:name => 'query[is_public]',
	171	:checked => 'checked'
	172	}
	173	assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
	174	:name => 'query_is_for_all',
	175	:checked => nil,
	176	:disabled => 'disabled' }
	177	end
	178
	179	def test_destroy
	180	@request.session[:user_id] = 2
	181	post :destroy, :id => 1
	182	assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook', :set_filter => 1, :query_id => nil
	183	assert_nil Query.find_by_id(1)
	184	end
	185	end

app/controllers/issues_controller.rb +8 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  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 IssuesController < ApplicationController
               layout 'base'
               menu_item :new_issue, :only => :new
               before_filter :find_issue, :only => [:show, :edit, :destroy_attachment]
               before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
               before_filter :find_project, :only => [:new, :update_form, :preview]
               before_filter :authorize, :except => [:index, :changes, :preview, :update_form, :context_menu]
               before_filter :find_optional_project, :only => [:index, :changes]
               accept_key_auth :index, :changes
               helper :journals
               helper :projects
               include ProjectsHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               helper :issue_relations
               include IssueRelationsHelper
               helper :watchers
               include WatchersHelper
               helper :attachments
               include AttachmentsHelper
               helper :queries
               helper :sort
               include SortHelper
               include IssuesHelper
               def index
                 sort_init "#{Issue.table_name}.id", "desc"
                 sort_update
                 retrieve_query
                 if @query.valid?
                   limit = per_page_option
                   respond_to do |format|
                     format.html { }
                     format.atom { }
                     format.csv  { limit = Setting.issues_export_limit.to_i }
                     format.pdf  { limit = Setting.issues_export_limit.to_i }
                   end
                   @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
                   @issue_pages = Paginator.new self, @issue_count, limit, params['page']
                   @issues = Issue.find :all, :order => sort_clause,
                                        :include => [ :assigned_to, :status, :tracker, :project, :priority, :category, :fixed_version ],
                                        :conditions => @query.statement,
                                        :limit  =>  limit,
                                        :offset =>  @issue_pages.current.offset
                   respond_to do |format|
                     format.html { render :template => 'issues/index.rhtml', :layout => !request.xhr? }
                     format.atom { render_feed(@issues, :title => l(:label_issue_plural)) }
                     format.csv  { send_data(issues_to_csv(@issues, @project).read, :type => 'text/csv; header=present', :filename => 'export.csv') }
                     format.pdf  { send_data(render(:template => 'issues/index.rfpdf', :layout => false), :type => 'application/pdf', :filename => 'export.pdf') }
                   end
                 else
                   # Send html if the query is not valid
                   render(:template => 'issues/index.rhtml', :layout => !request.xhr?)
                 end
+              rescue ActiveRecord::RecordNotFound
+                render_404
               end
               def changes
                 sort_init "#{Issue.table_name}.id", "desc"
                 sort_update
                 retrieve_query
                 if @query.valid?
                   @journals = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status]} ],
                                                  :conditions => @query.statement,
                                                  :limit => 25,
                                                  :order => "#{Journal.table_name}.created_on DESC"
                 end
                 @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
                 render :layout => false, :content_type => 'application/atom+xml'
+              rescue ActiveRecord::RecordNotFound
+                render_404
               end
               def show
                 @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
                 @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
                 @journals.each_with_index {|j,i| j.indice = i+1}
                 @journals.reverse! if User.current.wants_comments_in_reverse_order?
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                 @activities = Enumeration::get_values('ACTI')
                 @priorities = Enumeration::get_values('IPRI')
                 respond_to do |format|
                   format.html { render :template => 'issues/show.rhtml' }
                   format.atom { render :action => 'changes', :layout => false, :content_type => 'application/atom+xml' }
                   format.pdf  { send_data(render(:template => 'issues/show.rfpdf', :layout => false), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
                 end
               end
               # Add a new issue
               # The new issue will be created from an existing one if copy_from parameter is given
               def new
                 @issue = params[:copy_from] ? Issue.new.copy_from(params[:copy_from]) : Issue.new(params[:issue])
                 @issue.project = @project
                 @issue.author = User.current
                 @issue.tracker ||= @project.trackers.find(params[:tracker_id] ? params[:tracker_id] : :first)
                 if @issue.tracker.nil?
                   flash.now[:error] = 'No tracker is associated to this project. Please check the Project settings.'
                   render :nothing => true, :layout => true
                   return
                 end
                 default_status = IssueStatus.default
                 unless default_status
                   flash.now[:error] = 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
                   render :nothing => true, :layout => true
                   return
                 end
                 @issue.status = default_status
                 @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker)).uniq
                 if request.get? || request.xhr?
                   @issue.start_date ||= Date.today
                   @custom_values = @issue.custom_values.empty? ?
                     @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) } :
                     @issue.custom_values
                 else
                   requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
                   # Check that the user is allowed to apply the requested status
                   @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
                   @custom_values = @project.custom_fields_for_issues(@issue.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
                     attach_files(@issue, params[:attachments])
                     flash[:notice] = l(:notice_successful_create)
                     Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
                     redirect_to :controller => 'issues', :action => 'show', :id => @issue,  :project_id => @project
                     return
                   end
                 end
                 @priorities = Enumeration::get_values('IPRI')
                 render :layout => !request.xhr?
               end
               # Attributes that can be updated on workflow transition (without :edit permission)
               # TODO: make it configurable (at least per role)
               UPDATABLE_ATTRS_ON_TRANSITION = %w(status_id assigned_to_id fixed_version_id done_ratio) unless const_defined?(:UPDATABLE_ATTRS_ON_TRANSITION)
               def edit
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 @activities = Enumeration::get_values('ACTI')
                 @priorities = Enumeration::get_values('IPRI')
                 @custom_values = []
                 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                 @notes = params[:notes]
                 journal = @issue.init_journal(User.current, @notes)
                 # User can change issue attributes only if he has :edit permission or if a workflow transition is allowed
                 if (@edit_allowed || !@allowed_statuses.empty?) && params[:issue]
                   attrs = params[:issue].dup
                   attrs.delete_if {|k,v| !UPDATABLE_ATTRS_ON_TRANSITION.include?(k) } unless @edit_allowed
                   attrs.delete(:status_id) unless @allowed_statuses.detect {|s| s.id.to_s == attrs[:status_id].to_s}
                   @issue.attributes = attrs
                 end
                 if request.get?
                   @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
                 else
                   # Update custom fields if user has :edit permission
                   if @edit_allowed && params[:custom_fields]
                     @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                     @issue.custom_values = @custom_values
                   end
                   attachments = attach_files(@issue, params[:attachments])
                   attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
                   if @issue.save
                     # Log spend time
                     if current_role.allowed_to?(:log_time)
                       @time_entry = TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
                       @time_entry.attributes = params[:time_entry]
                       @time_entry.save
                     end
                     if !journal.new_record?
                       # Only send notification if something was actually changed
                       flash[:notice] = l(:notice_successful_update)
                       Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
                     end
                     redirect_to(params[:back_to] || {:action => 'show', :id => @issue})
                   end
                 end
               rescue ActiveRecord::StaleObjectError
                 # Optimistic locking exception
                 flash.now[:error] = l(:notice_locking_conflict)
               end
               # Bulk edit a set of issues
               def bulk_edit
                 if request.post?
                   status = params[:status_id].blank? ? nil : IssueStatus.find_by_id(params[:status_id])
                   priority = params[:priority_id].blank? ? nil : Enumeration.find_by_id(params[:priority_id])
                   assigned_to = (params[:assigned_to_id].blank? || params[:assigned_to_id] == 'none') ? nil : User.find_by_id(params[:assigned_to_id])
                   category = (params[:category_id].blank? || params[:category_id] == 'none') ? nil : @project.issue_categories.find_by_id(params[:category_id])
                   fixed_version = (params[:fixed_version_id].blank? || params[:fixed_version_id] == 'none') ? nil : @project.versions.find_by_id(params[:fixed_version_id])
                   unsaved_issue_ids = []
                   @issues.each do |issue|
                     journal = issue.init_journal(User.current, params[:notes])
                     issue.priority = priority if priority
                     issue.assigned_to = assigned_to if assigned_to || params[:assigned_to_id] == 'none'
                     issue.category = category if category || params[:category_id] == 'none'
                     issue.fixed_version = fixed_version if fixed_version || params[:fixed_version_id] == 'none'
                     issue.start_date = params[:start_date] unless params[:start_date].blank?
                     issue.due_date = params[:due_date] unless params[:due_date].blank?
                     issue.done_ratio = params[:done_ratio] unless params[:done_ratio].blank?
                     # Don't save any change to the issue if the user is not authorized to apply the requested status
                     if (status.nil? || (issue.status.new_status_allowed_to?(status, current_role, issue.tracker) && issue.status = status)) && issue.save
                       # Send notification for each issue (if changed)
                       Mailer.deliver_issue_edit(journal) if journal.details.any? && Setting.notified_events.include?('issue_updated')
                     else
                       # Keep unsaved issue ids to display them in flash error
                       unsaved_issue_ids << issue.id
                     end
                   end
                   if unsaved_issue_ids.empty?
                     flash[:notice] = l(:notice_successful_update) unless @issues.empty?
                   else
                     flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
                   end
                   redirect_to :controller => 'issues', :action => 'index', :project_id => @project
                   return
                 end
                 # Find potential statuses the user could be allowed to switch issues to
                 @available_statuses = Workflow.find(:all, :include => :new_status,
                                                           :conditions => {:role_id => current_role.id}).collect(&:new_status).compact.uniq
               end
               def move
                 @allowed_projects = []
                 # find projects to which the user is allowed to move the issue
                 if User.current.admin?
                   # admin is allowed to move issues to any active (visible) project
                   @allowed_projects = Project.find(:all, :conditions => Project.visible_by(User.current), :order => 'name')
                 else
                   User.current.memberships.each {|m| @allowed_projects << m.project if m.role.allowed_to?(:move_issues)}
                 end
                 @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
                 @target_project ||= @project
                 @trackers = @target_project.trackers
                 if request.post?
                   new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
                   unsaved_issue_ids = []
                   @issues.each do |issue|
                     unsaved_issue_ids << issue.id unless issue.move_to(@target_project, new_tracker)
                   end
                   if unsaved_issue_ids.empty?
                     flash[:notice] = l(:notice_successful_update) unless @issues.empty?
                   else
                     flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
                   end
                   redirect_to :controller => 'issues', :action => 'index', :project_id => @project
                   return
                 end
                 render :layout => false if request.xhr?
               end
               def destroy
                 @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
                 if @hours > 0
                   case params[:todo]
                   when 'destroy'
                     # nothing to do
                   when 'nullify'
                     TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
                   when 'reassign'
                     reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
                     if reassign_to.nil?
                       flash.now[:error] = l(:error_issue_not_found_in_project)
                       return
                     else
                       TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
                     end
                   else
                     # display the destroy form
                     return
                   end
                 end
                 @issues.each(&:destroy)
                 redirect_to :action => 'index', :project_id => @project
               end
               def destroy_attachment
                 a = @issue.attachments.find(params[:attachment_id])
                 a.destroy
                 journal = @issue.init_journal(User.current)
                 journal.details << JournalDetail.new(:property => 'attachment',
                                                      :prop_key => a.id,
                                                      :old_value => a.filename)
                 journal.save
                 redirect_to :action => 'show', :id => @issue
               end
               def context_menu
                 @issues = Issue.find_all_by_id(params[:ids], :include => :project)
                 if (@issues.size == 1)
                   @issue = @issues.first
                   @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                   @assignables = @issue.assignable_users
                   @assignables << @issue.assigned_to if @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
                 end
                 projects = @issues.collect(&:project).compact.uniq
                 @project = projects.first if projects.size == 1
                 @can = {:edit => (@project && User.current.allowed_to?(:edit_issues, @project)),
                         :update => (@issue && (User.current.allowed_to?(:edit_issues, @project) || (User.current.allowed_to?(:change_status, @project) && !@allowed_statuses.empty?))),
                         :move => (@project && User.current.allowed_to?(:move_issues, @project)),
                         :copy => (@issue && @project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
                         :delete => (@project && User.current.allowed_to?(:delete_issues, @project))
                         }
                 @priorities = Enumeration.get_values('IPRI').reverse
                 @statuses = IssueStatus.find(:all, :order => 'position')
                 @back = request.env['HTTP_REFERER']
                 render :layout => false
               end
               def update_form
                 @issue = Issue.new(params[:issue])
                 render :action => :new, :layout => false
               end
               def preview
                 issue = @project.issues.find_by_id(params[:id])
                 @attachements = issue.attachments if issue
                 @text = params[:notes] || (params[:issue] ? params[:issue][:description] : nil)
                 render :partial => 'common/preview'
               end
             private
               def find_issue
                 @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
                 @project = @issue.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Filter for bulk operations
               def find_issues
                 @issues = Issue.find_all_by_id(params[:id] || params[:ids])
                 raise ActiveRecord::RecordNotFound if @issues.empty?
                 projects = @issues.collect(&:project).compact.uniq
                 if projects.size == 1
                   @project = projects.first
                 else
                   # TODO: let users bulk edit/move/destroy issues from different projects
                   render_error 'Can not bulk edit/move/destroy issues from different projects' and return false
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_project
                 @project = Project.find(params[:project_id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_optional_project
                 return true unless params[:project_id]
                 @project = Project.find(params[:project_id])
                 authorize
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Retrieve query from session or build a new query
               def retrieve_query
                 if !params[:query_id].blank?
-                  @query = Query.find(params[:query_id], :conditions => {:project_id => (@project ? @project.id : nil)})
+                  cond = "project_id IS NULL"
+                  cond << " OR project_id = #{@project.id}" if @project
+                  @query = Query.find(params[:query_id], :conditions => cond)
+                  @query.project = @project
                   session[:query] = {:id => @query.id, :project_id => @query.project_id}
                 else
                   if params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
                     # Give it a name, required to be valid
                     @query = Query.new(:name => "_")
                     @query.project = @project
                     if params[:fields] and params[:fields].is_a? Array
                       params[:fields].each do |field|
                         @query.add_filter(field, params[:operators][field], params[:values][field])
                       end
                     else
                       @query.available_filters.keys.each do |field|
                         @query.add_short_filter(field, params[field]) if params[field]
                       end
                     end
                     session[:query] = {:project_id => @query.project_id, :filters => @query.filters}
                   else
                     @query = Query.find_by_id(session[:query][:id]) if session[:query][:id]
                     @query ||= Query.new(:name => "_", :project => @project, :filters => session[:query][:filters])
                   end
                 end
               end
             end

app/controllers/queries_controller.rb +16 -18

             # redMine - project management software
             # Copyright (C) 2006-2007  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 QueriesController < ApplicationController
               layout 'base'
               menu_item :issues
-              before_filter :find_project, :authorize
+              before_filter :find_query, :except => :new
+              before_filter :find_project, :authorize, :only => :new
-              def index
-                @queries = @project.queries.find(:all,
-                                                 :order => "name ASC",
-                                                 :conditions => ["is_public = ? or user_id = ?", true, (User.current.logged? ? User.current.id : 0)])
-              end
               def new
                 @query = Query.new(params[:query])
-                @query.project = @project
+                @query.project = params[:query_is_for_all] ? nil : @project
                 @query.user = User.current
-                @query.is_public = false unless current_role.allowed_to?(:manage_public_queries)
+                @query.is_public = false unless (@query.project && current_role.allowed_to?(:manage_public_queries)) || User.current.admin?
                 @query.column_names = nil if params[:default_columns]
                 params[:fields].each do |field|
                   @query.add_filter(field, params[:operators][field], params[:values][field])
                 end if params[:fields]
                 if request.post? && params[:confirm] && @query.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to :controller => 'issues', :action => 'index', :project_id => @project, :query_id => @query
                   return
                 end
                 render :layout => false if request.xhr?
               end
               def edit
                 if request.post?
                   @query.filters = {}
                   params[:fields].each do |field|
                     @query.add_filter(field, params[:operators][field], params[:values][field])
                   end if params[:fields]
                   @query.attributes = params[:query]
-                  @query.is_public = false unless current_role.allowed_to?(:manage_public_queries)
+                  @query.project = nil if params[:query_is_for_all]
+                  @query.is_public = false unless (@query.project && current_role.allowed_to?(:manage_public_queries)) || User.current.admin?
                   @query.column_names = nil if params[:default_columns]
                   if @query.save
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :controller => 'issues', :action => 'index', :project_id => @project, :query_id => @query
                   end
                 end
               end
               def destroy
                 @query.destroy if request.post?
-                redirect_to :controller => 'queries', :project_id => @project
+                redirect_to :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1
               end
             private
+              def find_query
+                @query = Query.find(params[:id])
+                @project = @query.project
+                render_403 unless @query.editable_by?(User.current)
+              rescue ActiveRecord::RecordNotFound
+                render_404
+              end
               def find_project
-                if params[:id]
+                @project = Project.find(params[:project_id])
-                  @query = Query.find(params[:id])
-                  @project = @query.project
-                  render_403 unless @query.editable_by?(User.current)
-                else
-                  @project = Project.find(params[:project_id])
-                end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/helpers/issues_helper.rb +13 0

             # 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.
             require 'csv'
             module IssuesHelper
               include ApplicationHelper
               def render_issue_tooltip(issue)
                 @cached_label_start_date ||= l(:field_start_date)
                 @cached_label_due_date ||= l(:field_due_date)
                 @cached_label_assigned_to ||= l(:field_assigned_to)
                 @cached_label_priority ||= l(:field_priority)
                 link_to_issue(issue) + ": #{h(issue.subject)}<br /><br />" +
                   "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />" +
                   "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />" +
                   "<strong>#{@cached_label_assigned_to}</strong>: #{issue.assigned_to}<br />" +
                   "<strong>#{@cached_label_priority}</strong>: #{issue.priority.name}"
               end
+              def sidebar_queries
+                unless @sidebar_queries
+                  # User can see public queries and his own queries
+                  visible = ARCondition.new(["is_public = ? OR user_id = ?", true, (User.current.logged? ? User.current.id : 0)])
+                  # Project specific queries and global queries
+                  visible << (@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id])
+                  @sidebar_queries = Query.find(:all,
+                                                :order => "name ASC",
+                                                :conditions => visible.conditions)
+                end
+                @sidebar_queries
+              end
               def show_detail(detail, no_html=false)
                 case detail.property
                 when 'attr'
                   label = l(("field_" + detail.prop_key.to_s.gsub(/\_id$/, "")).to_sym)
                   case detail.prop_key
                   when 'due_date', 'start_date'
                     value = format_date(detail.value.to_date) if detail.value
                     old_value = format_date(detail.old_value.to_date) if detail.old_value
                   when 'status_id'
                     s = IssueStatus.find_by_id(detail.value) and value = s.name if detail.value
                     s = IssueStatus.find_by_id(detail.old_value) and old_value = s.name if detail.old_value
                   when 'assigned_to_id'
                     u = User.find_by_id(detail.value) and value = u.name if detail.value
                     u = User.find_by_id(detail.old_value) and old_value = u.name if detail.old_value
                   when 'priority_id'
                     e = Enumeration.find_by_id(detail.value) and value = e.name if detail.value
                     e = Enumeration.find_by_id(detail.old_value) and old_value = e.name if detail.old_value
                   when 'category_id'
                     c = IssueCategory.find_by_id(detail.value) and value = c.name if detail.value
                     c = IssueCategory.find_by_id(detail.old_value) and old_value = c.name if detail.old_value
                   when 'fixed_version_id'
                     v = Version.find_by_id(detail.value) and value = v.name if detail.value
                     v = Version.find_by_id(detail.old_value) and old_value = v.name if detail.old_value
                   end
                 when 'cf'
                   custom_field = CustomField.find_by_id(detail.prop_key)
                   if custom_field
                     label = custom_field.name
                     value = format_value(detail.value, custom_field.field_format) if detail.value
                     old_value = format_value(detail.old_value, custom_field.field_format) if detail.old_value
                   end
                 when 'attachment'
                   label = l(:label_attachment)
                 end
                 label ||= detail.prop_key
                 value ||= detail.value
                 old_value ||= detail.old_value
                 unless no_html
                   label = content_tag('strong', label)
                   old_value = content_tag("i", h(old_value)) if detail.old_value
                   old_value = content_tag("strike", old_value) if detail.old_value and (!detail.value or detail.value.empty?)
                   if detail.property == 'attachment' && !value.blank? && Attachment.find_by_id(detail.prop_key)
                     # Link to the attachment if it has not been removed
                     value = link_to(value, :controller => 'attachments', :action => 'download', :id => detail.prop_key)
                   else
                     value = content_tag("i", h(value)) if value
                   end
                 end
                 if !detail.value.blank?
                   case detail.property
                   when 'attr', 'cf'
                     if !detail.old_value.blank?
                       label + " " + l(:text_journal_changed, old_value, value)
                     else
                       label + " " + l(:text_journal_set_to, value)
                     end
                   when 'attachment'
                     "#{label} #{value} #{l(:label_added)}"
                   end
                 else
                   case detail.property
                   when 'attr', 'cf'
                     label + " " + l(:text_journal_deleted) + " (#{old_value})"
                   when 'attachment'
                     "#{label} #{old_value} #{l(:label_deleted)}"
                   end
                 end
               end
               def issues_to_csv(issues, project = nil)
                 ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')
                 export = StringIO.new
                 CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
                   # csv header fields
                   headers = [ "#",
                               l(:field_status),
                               l(:field_project),
                               l(:field_tracker),
                               l(:field_priority),
                               l(:field_subject),
                               l(:field_assigned_to),
                               l(:field_category),
                               l(:field_fixed_version),
                               l(:field_author),
                               l(:field_start_date),
                               l(:field_due_date),
                               l(:field_done_ratio),
                               l(:field_estimated_hours),
                               l(:field_created_on),
                               l(:field_updated_on)
                               ]
                   # Export project custom fields if project is given
                   # otherwise export custom fields marked as "For all projects"
                   custom_fields = project.nil? ? IssueCustomField.for_all : project.all_custom_fields
                   custom_fields.each {|f| headers << f.name}
                   # Description in the last column
                   headers << l(:field_description)
                   csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
                   # csv lines
                   issues.each do |issue|
                     fields = [issue.id,
                               issue.status.name,
                               issue.project.name,
                               issue.tracker.name,
                               issue.priority.name,
                               issue.subject,
                               issue.assigned_to,
                               issue.category,
                               issue.fixed_version,
                               issue.author.name,
                               format_date(issue.start_date),
                               format_date(issue.due_date),
                               issue.done_ratio,
                               issue.estimated_hours,
                               format_time(issue.created_on),
                               format_time(issue.updated_on)
                               ]
                     custom_fields.each {|f| fields << show_value(issue.custom_value_for(f)) }
                     fields << issue.description
                     csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
                   end
                 end
                 export.rewind
                 export
               end
             end

app/models/query.rb +9 -2

             # redMine - project management software
             # Copyright (C) 2006-2007  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 QueryColumn
               attr_accessor :name, :sortable, :default_order
               include GLoc
               def initialize(name, options={})
                 self.name = name
                 self.sortable = options[:sortable]
                 self.default_order = options[:default_order]
               end
               def caption
                 set_language_if_valid(User.current.language)
                 l("field_#{name}")
               end
             end
             class QueryCustomFieldColumn < QueryColumn
               def initialize(custom_field)
                 self.name = "cf_#{custom_field.id}".to_sym
                 self.sortable = false
                 @cf = custom_field
               end
               def caption
                 @cf.name
               end
               def custom_field
                 @cf
               end
             end
             class Query < ActiveRecord::Base
               belongs_to :project
               belongs_to :user
               serialize :filters
               serialize :column_names
               attr_protected :project_id, :user_id
               validates_presence_of :name, :on => :save
               validates_length_of :name, :maximum => 255
               @@operators = { "="   => :label_equals,
                               "!"   => :label_not_equals,
                               "o"   => :label_open_issues,
                               "c"   => :label_closed_issues,
                               "!*"  => :label_none,
                               "*"   => :label_all,
                               ">="   => '>=',
                               "<="   => '<=',
                               "<t+" => :label_in_less_than,
                               ">t+" => :label_in_more_than,
                               "t+"  => :label_in,
                               "t"   => :label_today,
                               "w"   => :label_this_week,
                               ">t-" => :label_less_than_ago,
                               "<t-" => :label_more_than_ago,
                               "t-"  => :label_ago,
                               "~"   => :label_contains,
                               "!~"  => :label_not_contains }
               cattr_reader :operators
               @@operators_by_filter_type = { :list => [ "=", "!" ],
                                              :list_status => [ "o", "=", "!", "c", "*" ],
                                              :list_optional => [ "=", "!", "!*", "*" ],
                                              :list_subprojects => [ "*", "!*", "=" ],
                                              :date => [ "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-" ],
                                              :date_past => [ ">t-", "<t-", "t-", "t", "w" ],
                                              :string => [ "=", "~", "!", "!~" ],
                                              :text => [  "~", "!~" ],
                                              :integer => [ "=", ">=", "<=" ] }
               cattr_reader :operators_by_filter_type
               @@available_columns = [
                 QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position"),
                 QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position"),
                 QueryColumn.new(:priority, :sortable => "#{Enumeration.table_name}.position", :default_order => 'desc'),
                 QueryColumn.new(:subject, :sortable => "#{Issue.table_name}.subject"),
                 QueryColumn.new(:author),
                 QueryColumn.new(:assigned_to, :sortable => "#{User.table_name}.lastname"),
                 QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on", :default_order => 'desc'),
                 QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name"),
                 QueryColumn.new(:fixed_version, :sortable => "#{Version.table_name}.effective_date", :default_order => 'desc'),
                 QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
                 QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
                 QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
                 QueryColumn.new(:done_ratio, :sortable => "#{Issue.table_name}.done_ratio"),
                 QueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on", :default_order => 'desc'),
               ]
               cattr_reader :available_columns
               def initialize(attributes = nil)
                 super attributes
                 self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
                 set_language_if_valid(User.current.language)
               end
+              def after_initialize
+                # Store the fact that project is nil (used in #editable_by?)
+                @is_for_all = project.nil?
+              end
               def validate
                 filters.each_key do |field|
                   errors.add label_for(field), :activerecord_error_blank unless
                       # filter requires one or more values
                       (values_for(field) and !values_for(field).first.empty?) or
                       # filter doesn't require any value
                       ["o", "c", "!*", "*", "t", "w"].include? operator_for(field)
                 end if filters
               end
               def editable_by?(user)
                 return false unless user
-                return true if !is_public && self.user_id == user.id
+                # Admin can edit them all and regular users can edit their private queries
-                is_public && user.allowed_to?(:manage_public_queries, project)
+                return true if user.admin? || (!is_public && self.user_id == user.id)
+                # Members can not edit public queries that are for all project (only admin is allowed to)
+                is_public && !@is_for_all && user.allowed_to?(:manage_public_queries, project)
               end
               def available_filters
                 return @available_filters if @available_filters
                 trackers = project.nil? ? Tracker.find(:all, :order => 'position') : project.rolled_up_trackers
                 @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },
                                        "tracker_id" => { :type => :list, :order => 2, :values => trackers.collect{|s| [s.name, s.id.to_s] } },
                                        "priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI'], :order => 'position').collect{|s| [s.name, s.id.to_s] } },
                                        "subject" => { :type => :text, :order => 8 },
                                        "created_on" => { :type => :date_past, :order => 9 },
                                        "updated_on" => { :type => :date_past, :order => 10 },
                                        "start_date" => { :type => :date, :order => 11 },
                                        "due_date" => { :type => :date, :order => 12 },
                                        "done_ratio" =>  { :type => :integer, :order => 13 }}
                 user_values = []
                 user_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
                 if project
                   user_values += project.users.sort.collect{|s| [s.name, s.id.to_s] }
                 else
                   # members of the user's projects
                   user_values += User.current.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }
                 end
                 @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?
                     @available_filters["subproject_id"] = { :type => :list_subprojects, :order => 13, :values => @project.active_children.collect{|s| [s.name, s.id.to_s] } }
                   end
                   @project.all_custom_fields.select(&:is_filter?).each do |field|
                     case field.field_format
                     when "text"
                       options = { :type => :text, :order => 20 }
                     when "list"
                       options = { :type => :list_optional, :values => field.possible_values, :order => 20}
                     when "date"
                       options = { :type => :date, :order => 20 }
                     when "bool"
                       options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }
                     else
                       options = { :type => :string, :order => 20 }
                     end
                     @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })
                   end
                   # remove category filter if no category defined
                   @available_filters.delete "category_id" if @available_filters["category_id"][:values].empty?
                 end
                 @available_filters
               end
               def add_filter(field, operator, values)
                 # values must be an array
                 return unless values and values.is_a? Array # and !values.first.empty?
                 # check if field is defined as an available filter
                 if available_filters.has_key? field
                   filter_options = available_filters[field]
                   # check if operator is allowed for that filter
                   #if @@operators_by_filter_type[filter_options[:type]].include? operator
                   #  allowed_values = values & ([""] + (filter_options[:values] || []).collect {|val| val[1]})
                   #  filters[field] = {:operator => operator, :values => allowed_values } if (allowed_values.first and !allowed_values.first.empty?) or ["o", "c", "!*", "*", "t"].include? operator
                   #end
                   filters[field] = {:operator => operator, :values => values }
                 end
               end
               def add_short_filter(field, expression)
                 return unless expression
                 parms = expression.scan(/^(o|c|\!|\*)?(.*)$/).first
                 add_filter field, (parms[0] || "="), [parms[1] || ""]
               end
               def has_filter?(field)
                 filters and filters[field]
               end
               def operator_for(field)
                 has_filter?(field) ? filters[field][:operator] : nil
               end
               def values_for(field)
                 has_filter?(field) ? filters[field][:values] : nil
               end
               def label_for(field)
                 label = @available_filters[field][:name] if @available_filters.has_key?(field)
                 label ||= field.gsub(/\_id$/, "")
               end
               def available_columns
                 return @available_columns if @available_columns
                 @available_columns = Query.available_columns
                 @available_columns += (project ?
                                         project.all_custom_fields :
                                         IssueCustomField.find(:all, :conditions => {:is_for_all => true})
                                        ).collect {|cf| QueryCustomFieldColumn.new(cf) }
               end
               def columns
                 if has_default_columns?
                   available_columns.select {|c| Setting.issue_list_default_columns.include?(c.name.to_s) }
                 else
                   # preserve the column_names order
                   column_names.collect {|name| available_columns.find {|col| col.name == name}}.compact
                 end
               end
               def column_names=(names)
                 names = names.select {|n| n.is_a?(Symbol) || !n.blank? } if names
                 names = names.collect {|n| n.is_a?(Symbol) ? n : n.to_sym } if names
                 write_attribute(:column_names, names)
               end
               def has_column?(column)
                 column_names && column_names.include?(column.name)
               end
               def has_default_columns?
                 column_names.nil? || column_names.empty?
               end
               def statement
                 # project/subprojects clause
                 clause = ''
                 if project && !@project.active_children.empty?
                   ids = [project.id]
                   if has_filter?("subproject_id")
                     case operator_for("subproject_id")
                     when '='
                       # include the selected subprojects
                       ids += values_for("subproject_id").each(&:to_i)
                     when '!*'
                       # main project only
                     else
                       # all subprojects
                       ids += project.active_children.collect{|p| p.id}
                     end
                   elsif Setting.display_subprojects_issues?
                     ids += project.active_children.collect{|p| p.id}
                   end
                   clause << "#{Issue.table_name}.project_id IN (%s)" % ids.join(',')
                 elsif project
                   clause << "#{Issue.table_name}.project_id = %d" % project.id
                 else
                   clause << Project.visible_by(User.current)
                 end
                 # filters clauses
                 filters_clauses = []
                 filters.each_key do |field|
                   next if field == "subproject_id"
                   v = values_for(field).clone
                   next unless v and !v.empty?
                   sql = ''
                   if field =~ /^cf_(\d+)$/
                     # custom field
                     db_table = CustomValue.table_name
                     db_field = 'value'
                     sql << "#{Issue.table_name}.id IN (SELECT #{db_table}.customized_id FROM #{db_table} where #{db_table}.customized_type='Issue' AND #{db_table}.customized_id=#{Issue.table_name}.id AND #{db_table}.custom_field_id=#{$1} AND "
                   else
                     # regular field
                     db_table = Issue.table_name
                     db_field = field
                     sql << '('
                   end
                   # "me" value subsitution
                   if %w(assigned_to_id author_id).include?(field)
                     v.push(User.current.logged? ? User.current.id.to_s : "0") if v.delete("me")
                   end
                   case operator_for field
                   when "="
                     sql = sql + "#{db_table}.#{db_field} IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
                   when "!"
                     sql = sql + "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))"
                   when "!*"
                     sql = sql + "#{db_table}.#{db_field} IS NULL"
                   when "*"
                     sql = sql + "#{db_table}.#{db_field} IS NOT NULL"
                   when ">="
                     sql = sql + "#{db_table}.#{db_field} >= #{v.first.to_i}"
                   when "<="
                     sql = sql + "#{db_table}.#{db_field} <= #{v.first.to_i}"
                   when "o"
                     sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"
                   when "c"
                     sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id"
                   when ">t-"
                     sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today - v.first.to_i).to_time), connection.quoted_date((Date.today + 1).to_time)]
                   when "<t-"
                     sql = sql + "#{db_table}.#{db_field} <= '%s'" % connection.quoted_date((Date.today - v.first.to_i).to_time)
                   when "t-"
                     sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today - v.first.to_i).to_time), connection.quoted_date((Date.today - v.first.to_i + 1).to_time)]
                   when ">t+"
                     sql = sql + "#{db_table}.#{db_field} >= '%s'" % connection.quoted_date((Date.today + v.first.to_i).to_time)
                   when "<t+"
                     sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Date.today.to_time), connection.quoted_date((Date.today + v.first.to_i + 1).to_time)]
                   when "t+"
                     sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date((Date.today + v.first.to_i).to_time), connection.quoted_date((Date.today + v.first.to_i + 1).to_time)]
                   when "t"
                     sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Date.today.to_time), connection.quoted_date((Date.today+1).to_time)]
                   when "w"
                     from = l(:general_first_day_of_week) == '7' ?
                       # week starts on sunday
                       ((Date.today.cwday == 7) ? Time.now.at_beginning_of_day : Time.now.at_beginning_of_week - 1.day) :
                       # week starts on monday (Rails default)
                       Time.now.at_beginning_of_week
                     sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(from), connection.quoted_date(from + 7.days)]
                   when "~"
                     sql = sql + "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(v.first)}%'"
                   when "!~"
                     sql = sql + "#{db_table}.#{db_field} NOT LIKE '%#{connection.quote_string(v.first)}%'"
                   end
                   sql << ')'
                   filters_clauses << sql
                 end if filters and valid?
                 clause << ' AND ' unless clause.empty?
                 clause << filters_clauses.join(' AND ') unless filters_clauses.empty?
                 clause
               end
             end

app/views/issues/_sidebar.rhtml +6 -5

+            <% if @project %>
             <h3><%= l(:label_issue_plural) %></h3>
             <%= link_to l(:label_issue_view_all), { :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 } %><br />
             <%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %><br />
             <%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %>
+            <% end %>
+            <% unless sidebar_queries.empty? -%>
             <h3><%= l(:label_query_plural) %></h3>
-            <% queries = @project.queries.find(:all,
+            <% sidebar_queries.each do |query| -%>
-                                               :order => "name ASC",
-                                               :conditions => ["is_public = ? or user_id = ?", true, (User.current.logged? ? User.current.id : 0)])
-               queries.each do |query| %>
             <%= link_to query.name, :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query %><br />
-            <% end %>
+            <% end -%>
+            <% end -%>

app/views/issues/index.rhtml +1 -1

             <% if @query.new_record? %>
                 <h2><%=l(:label_issue_plural)%></h2>
                 <% html_title(l(:label_issue_plural)) %>
                 <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %>
                 <%= hidden_field_tag('project_id', @project.id) if @project %>
                 <fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>
                 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
                 <p class="buttons">
                 <%= link_to_remote l(:button_apply),
                                    { :url => { :set_filter => 1 },
                                      :update => "content",
                                      :with => "Form.serialize('query_form')"
                                    }, :class => 'icon icon-checked' %>
                 <%= link_to_remote l(:button_clear),
                                    { :url => { :set_filter => 1 },
                                      :update => "content",
                                    }, :class => 'icon icon-reload'  %>
                 <% if current_role && current_role.allowed_to?(:save_queries) %>
                 <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %>
                 <% end %>
                 </p>
                 </fieldset>
                 <% end %>
             <% else %>
                 <div class="contextual">
                 <% if @query.editable_by?(User.current) %>
                 <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %>
                 <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
                 <% end %>
                 </div>
                 <h2><%=h @query.name %></h2>
                 <div id="query_form"></div>
                 <% html_title @query.name %>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <% if @issues.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
             <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
             <p class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></p>
             <p class="other-formats">
             <%= l(:label_export_to) %>
             <span><%= link_to 'Atom', {:format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
             <span><%= link_to 'CSV', {:format => 'csv'}, :class => 'csv' %></span>
             <span><%= link_to 'PDF', {:format => 'pdf'}, :class => 'pdf' %></span>
             </p>
             <% end %>
             <% end %>
             <% content_for :sidebar do %>
                 <%= render :partial => 'issues/sidebar' %>
-            <% end if @project%>
+            <% end %>
             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom, {:query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_issue_plural)) %>
                 <%= auto_discovery_link_tag(:atom, {:action => 'changes', :query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_changes_details)) %>
                 <%= javascript_include_tag 'context_menu' %>
                 <%= stylesheet_link_tag 'context_menu' %>
             <% end %>
             <div id="context-menu" style="display: none;"></div>
             <%= javascript_tag "new ContextMenu('#{url_for(:controller => 'issues', :action => 'context_menu')}')" %>

app/views/queries/_form.rhtml +8 -3

             <%= error_messages_for 'query' %>
             <%= hidden_field_tag 'confirm', 1 %>
             <div class="box">
             <div class="tabular">
             <p><label for="query_name"><%=l(:field_name)%></label>
             <%= text_field 'query', 'name', :size => 80 %></p>
-            <% if current_role.allowed_to?(:manage_public_queries) %>
+            <% if User.current.admin? || (@project && current_role.allowed_to?(:manage_public_queries)) %>
-              <p><label for="query_is_public"><%=l(:field_is_public)%></label>
+            <p><label for="query_is_public"><%=l(:field_is_public)%></label>
-              <%= check_box 'query', 'is_public' %></p>
+            <%= check_box 'query', 'is_public',
+                  :onchange => (User.current.admin? ? nil : 'if (this.checked) {$("query_is_for_all").checked = false; $("query_is_for_all").disabled = true;} else {$("query_is_for_all").disabled = false;}') %></p>
             <% end %>
+            <p><label for="query_is_for_all"><%=l(:field_is_for_all)%></label>
+            <%= check_box_tag 'query_is_for_all', 1, @query.project.nil?,
+                  :disabled => (!@query.new_record? && (@query.project.nil? || (@query.is_public? && !User.current.admin?))) %></p>
             <p><label for="query_default_columns"><%=l(:label_default_columns)%></label>
             <%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns',
                   :onclick => 'if (this.checked) {Element.hide("columns")} else {Element.show("columns")}' %></p>
             </div>
             <fieldset><legend><%= l(:label_filter_plural) %></legend>
             <%= render :partial => 'queries/filters', :locals => {:query => query}%>
             </fieldset>
             <%= render :partial => 'queries/columns', :locals => {:query => query}%>
             </div>

test/fixtures/queries.yml +50 -3

@@ -1,22 +1,69
1	---	1	---
2	queries_001:	2	queries_001:
3	name: Multiple custom fields query	3	id: 1
4	project_id: 1	4	project_id: 1
		5	is_public: true
		6	name: Multiple custom fields query
5	filters: \|	7	filters: \|
6	---	8	---
7	cf_1:	9	cf_1:
8	:values:	10	:values:
9	- MySQL	11	- MySQL
10	:operator: "="	12	:operator: "="
11	status_id:	13	status_id:
12	:values:	14	:values:
13	- "1"	15	- "1"
14	:operator: o	16	:operator: o
15	cf_2:	17	cf_2:
16	:values:	18	:values:
17	- "125"	19	- "125"
18	:operator: "="	20	:operator: "="
19		21
20	id: 1
21	is_public: true
22	user_id: 1	22	user_id: 1
		23	column_names:
		24	queries_002:
		25	id: 2
		26	project_id: 1
		27	is_public: false
		28	name: Private query for cookbook
		29	filters: \|
		30	---
		31	tracker_id:
		32	:values:
		33	- "3"
		34	:operator: "="
		35	status_id:
		36	:values:
		37	- "1"
		38	:operator: o
		39
		40	user_id: 3
		41	column_names:
		42	queries_003:
		43	id: 3
		44	project_id:
		45	is_public: false
		46	name: Private query for all projects
		47	filters: \|
		48	---
		49	tracker_id:
		50	:values:
		51	- "3"
		52	:operator: "="
		53
		54	user_id: 3
		55	column_names:
		56	queries_004:
		57	id: 4
		58	project_id:
		59	is_public: true
		60	name: Public query for all projects
		61	filters: \|
		62	---
		63	tracker_id:
		64	:values:
		65	- "3"
		66	:operator: "="
		67
		68	user_id: 2
		69	column_names:

test/fixtures/roles.yml 0 -2

             ---
             roles_001:
               name: Manager
               id: 1
               builtin: 0
               permissions: |
                 ---
                 - :edit_project
                 - :manage_members
                 - :manage_versions
                 - :manage_categories
                 - :add_issues
                 - :edit_issues
                 - :manage_issue_relations
                 - :add_issue_notes
                 - :move_issues
                 - :delete_issues
                 - :manage_public_queries
                 - :save_queries
                 - :view_gantt
                 - :view_calendar
                 - :log_time
                 - :view_time_entries
                 - :edit_time_entries
                 - :delete_time_entries
                 - :manage_news
                 - :comment_news
                 - :view_documents
                 - :manage_documents
                 - :view_wiki_pages
                 - :edit_wiki_pages
                 - :delete_wiki_pages
                 - :rename_wiki_pages
                 - :add_messages
                 - :edit_messages
                 - :delete_messages
                 - :manage_boards
                 - :view_files
                 - :manage_files
                 - :browse_repository
                 - :view_changesets
               position: 1
             roles_002:
               name: Developer
               id: 2
               builtin: 0
               permissions: |
                 ---
                 - :edit_project
                 - :manage_members
                 - :manage_versions
                 - :manage_categories
                 - :add_issues
                 - :edit_issues
                 - :manage_issue_relations
                 - :add_issue_notes
                 - :move_issues
                 - :delete_issues
-                - :manage_public_queries
                 - :save_queries
                 - :view_gantt
                 - :view_calendar
                 - :log_time
                 - :view_time_entries
                 - :edit_own_time_entries
                 - :manage_news
                 - :comment_news
                 - :view_documents
                 - :manage_documents
                 - :view_wiki_pages
                 - :edit_wiki_pages
                 - :delete_wiki_pages
                 - :add_messages
                 - :manage_boards
                 - :view_files
                 - :manage_files
                 - :browse_repository
                 - :view_changesets
               position: 2
             roles_003:
               name: Reporter
               id: 3
               builtin: 0
               permissions: |
                 ---
                 - :edit_project
                 - :manage_members
                 - :manage_versions
                 - :manage_categories
                 - :add_issues
                 - :edit_issues
                 - :manage_issue_relations
                 - :add_issue_notes
                 - :move_issues
-                - :manage_public_queries
                 - :save_queries
                 - :view_gantt
                 - :view_calendar
                 - :log_time
                 - :view_time_entries
                 - :manage_news
                 - :comment_news
                 - :view_documents
                 - :manage_documents
                 - :view_wiki_pages
                 - :edit_wiki_pages
                 - :delete_wiki_pages
                 - :add_messages
                 - :manage_boards
                 - :view_files
                 - :manage_files
                 - :browse_repository
                 - :view_changesets
               position: 3
             roles_004:
               name: Non member
               id: 4
               builtin: 1
               permissions: |
                 ---
                 - :add_issues
                 - :edit_issues
                 - :manage_issue_relations
                 - :add_issue_notes
                 - :move_issues
                 - :save_queries
                 - :view_gantt
                 - :view_calendar
                 - :log_time
                 - :view_time_entries
                 - :comment_news
                 - :view_documents
                 - :manage_documents
                 - :view_wiki_pages
                 - :edit_wiki_pages
                 - :add_messages
                 - :view_files
                 - :manage_files
                 - :browse_repository
                 - :view_changesets
               position: 4
             roles_005:
               name: Anonymous
               id: 5
               builtin: 2
               permissions: |
                 ---
                 - :add_issue_notes
                 - :view_gantt
                 - :view_calendar
                 - :view_time_entries
                 - :view_documents
                 - :view_wiki_pages
                 - :view_files
                 - :browse_repository
                 - :view_changesets
               position: 5
   No newline at end of file

test/unit/query_test.rb +32 -2

             # redMine - project management software
-            # Copyright (C) 2006-2007  Jean-Philippe Lang
+            # Copyright (C) 2006-2008  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.
             require File.dirname(__FILE__) + '/../test_helper'
             class QueryTest < Test::Unit::TestCase
-              fixtures :projects, :users, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :queries
+              fixtures :projects, :users, :members, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :queries
               def test_query_with_multiple_custom_fields
                 query = Query.find(1)
                 assert query.valid?
                 assert query.statement.include?("custom_values.value IN ('MySQL')")
                 issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
                 assert_equal 1, issues.length
                 assert_equal Issue.find(3), issues.first
               end
               def test_default_columns
                 q = Query.new
                 assert !q.columns.empty?
               end
               def test_set_column_names
                 q = Query.new
                 q.column_names = ['tracker', :subject, '', 'unknonw_column']
                 assert_equal [:tracker, :subject], q.columns.collect {|c| c.name}
                 c = q.columns.first
                 assert q.has_column?(c)
               end
+              def test_editable_by
+                admin = User.find(1)
+                manager = User.find(2)
+                developer = User.find(3)
+                # Public query on project 1
+                q = Query.find(1)
+                assert q.editable_by?(admin)
+                assert q.editable_by?(manager)
+                assert !q.editable_by?(developer)
+                # Private query on project 1
+                q = Query.find(2)
+                assert q.editable_by?(admin)
+                assert !q.editable_by?(manager)
+                assert q.editable_by?(developer)
+                # Private query for all projects
+                q = Query.find(3)
+                assert q.editable_by?(admin)
+                assert !q.editable_by?(manager)
+                assert q.editable_by?(developer)
+                # Public query for all projects
+                q = Query.find(4)
+                assert q.editable_by?(admin)
+                assert !q.editable_by?(manager)
+                assert !q.editable_by?(developer)
+              end
             end

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