jro_apps/redmine Commit - r563:1c44600c62dc

Added per user custom queries....

Jean-Philippe Lang -

r563:1c44600c62dc

parent child

Context file:

r563:1c44600c62dc

Collapse all files

app/views/queries/index.rhtml created 644 +29 0

@@ -0,0 +1,29
	1	<div class="contextual">
	2	<% if loggedin? %>
	3	<%= link_to l(:label_query_new), {:controller => 'queries', :action => 'new', :project_id => @project}, :class => 'icon icon-add' %>
	4	<% end %>
	5	</div>
	6
	7	<h2><%= l(:label_query_plural) %></h2>
	8
	9	<% if @queries.empty? %>
	10	<p><i><%=l(:label_no_data)%></i></p>
	11	<% else %>
	12	<table class="list">
	13	<% @queries.each do \|query\| %>
	14	<tr class="<%= cycle('odd', 'even') %>">
	15	<td>
	16	<%= link_to query.name, :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => query %>
	17	</td>
	18	<td align="right">
	19	<small>
	20	<% if query.editable_by?(@logged_in_user) %>
	21	<%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => query}, :class => 'icon icon-edit' %>
	22	<%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
	23	</small>
	24	<% end %>
	25	</td>
	26	</tr>
	27	<% end %>
	28	</table>
	29	<% end %>

app/views/queries/new.rhtml created 644 +6 0

@@ -0,0 +1,6
	1	<h2><%= l(:label_query_new) %></h2>
	2
	3	<% form_tag({:action => 'new', :project_id => @query.project}) do %>
	4	<%= render :partial => 'form', :locals => {:query => @query} %>
	5	<%= submit_tag l(:button_save) %>
	6	<% end %>

app/controllers/projects_controller.rb 0 -17

             # 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.
             require 'csv'
             class ProjectsController < ApplicationController
               layout 'base'
               before_filter :find_project, :except => [ :index, :list, :add ]
               before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy ]
               before_filter :require_admin, :only => [ :add, :archive, :unarchive, :destroy ]
               cache_sweeper :project_sweeper, :only => [ :add, :edit, :archive, :unarchive, :destroy ]
               cache_sweeper :issue_sweeper, :only => [ :add_issue ]
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :ifpdf
               include IfpdfHelper
               helper IssuesHelper
               helper :queries
               include QueriesHelper
               helper :repositories
               include RepositoriesHelper
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               # Lists public projects
               def list
                 sort_init "#{Project.table_name}.name", "asc"
                 sort_update
                 @project_count = Project.count(:all, :conditions => Project.visible_by(logged_in_user))
                 @project_pages = Paginator.new self, @project_count,
 ,
             								params['page']
                 @projects = Project.find :all, :order => sort_clause,
             						:conditions => Project.visible_by(logged_in_user),
             						:include => :parent,
             						: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 params[:repository_enabled] && params[:repository_enabled] == "1"
                     @project.repository = Repository.factory(params[:repository_scm])
                     @project.repository.attributes = params[:repository]
                   end
                   if "1" == params[:wiki_enabled]
                     @project.wiki = Wiki.new
                     @project.wiki.attributes = params[:wiki]
                   end
                   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_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
                 @subprojects = @project.active_children
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = Tracker.find(:all, :order => 'position')
                 @open_issues_by_tracker = Issue.count(:group => :tracker, :joins => "INNER JOIN #{IssueStatus.table_name} ON #{IssueStatus.table_name}.id = #{Issue.table_name}.status_id", :conditions => ["project_id=? and #{IssueStatus.table_name}.is_closed=?", @project.id, false])
                 @total_issues_by_tracker = Issue.count(:group => :tracker, :conditions => ["project_id=?", @project.id])
               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
                 @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 params[:repository_enabled]
                     case params[:repository_enabled]
                     when "0"
                       @project.repository = nil
                     when "1"
                       @project.repository ||= Repository.factory(params[:repository_scm])
                       @project.repository.update_attributes params[:repository] if @project.repository
                     end
                   end
                   if params[:wiki_enabled]
                     case params[:wiki_enabled]
                     when "0"
                       @project.wiki.destroy if @project.wiki
                     when "1"
                       @project.wiki ||= Wiki.new
                       @project.wiki.update_attributes params[:wiki]
                     end
                   end
                   @project.attributes = params[:project]
                   if @project.save
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               def archive
                 @project.archive if request.post? && @project.active?
                 redirect_to :controller => 'admin', :action => 'projects'
               end
               def unarchive
                 @project.unarchive if request.post? && !@project.active?
                 redirect_to :controller => 'admin', :action => 'projects'
               end
               # Delete @project
               def destroy
                 @project_to_destroy = @project
                 if request.post? and params[:confirm]
                   @project_to_destroy.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 end
                 # hide project in layout
                 @project = nil
               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', :tab => 'categories', :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', :tab => 'versions', :id => @project
               	end
               end
               # Add a new member to @project
               def add_member
                 @member = @project.members.build(params[:member])
               	if request.post? && @member.save
               	  respond_to do |format|
                     format.html { redirect_to :action => 'settings', :tab => 'members', :id => @project }
                     format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'members'} }
                   end
                 else
                   settings
                   render :action => 'settings'
                 end
               end
               # Show members list of @project
               def list_members
                 @members = @project.members.find(:all)
               end
               # Add a new document to @project
               def add_document
                 @categories = Enumeration::get_values('DCAT')
                 @document = @project.documents.build(params[:document])
                 if request.post? and @document.save
                   # Save the attachments
                   params[:attachments].each { |a|
                     Attachment.create(:container => @document, :file => a, :author => logged_in_user) unless a.size == 0
                   } if params[:attachments] and params[:attachments].is_a? Array
                   flash[:notice] = l(:notice_successful_create)
                   Mailer.deliver_document_add(@document) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                   redirect_to :action => 'list_documents', :id => @project
                 end
               end
               # Show documents list of @project
               def list_documents
                 @documents = @project.documents.find :all, :include => :category
               end
               # Add a new issue to @project
               def add_issue
                 @tracker = Tracker.find(params[:tracker_id])
                 @priorities = Enumeration::get_values('IPRI')
                 default_status = IssueStatus.default
                 unless default_status
                   flash.now[:notice] = 'No default issue status defined. Please check your configuration.'
                   render :nothing => true, :layout => true
                   return
                 end
                 @issue = Issue.new(:project => @project, :tracker => @tracker)
                 @issue.status = default_status
                 @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker))if logged_in_user
                 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]
                   requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
                   @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
                   @issue.author_id = self.logged_in_user.id if self.logged_in_user
                   # Multiple file upload
                   @attachments = []
                   params[:attachments].each { |a|
                     @attachments << Attachment.new(:container => @issue, :file => a, :author => 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
                     @attachments.each(&: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 "#{Issue.table_name}.id", "desc"
                 sort_update
                 retrieve_query
                 @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
                 if @query.valid?
                   @issue_count = Issue.count(:include => [:status, :project, :custom_values], :conditions => @query.statement)
                   @issue_pages = Paginator.new self, @issue_count, @results_per_page, params['page']
                   @issues = Issue.find :all, :order => sort_clause,
               						:include => [ :assigned_to, :status, :tracker, :project, :priority, :custom_values ],
               						:conditions => @query.statement,
               						:limit  =>  @issue_pages.items_per_page,
               						:offset =>  @issue_pages.current.offset
                 end
-                @trackers = Tracker.find :all, :order => 'position'
                 render :layout => false if request.xhr?
               end
               # Export filtered/sorted issues list to CSV
               def export_issues_csv
                 sort_init "#{Issue.table_name}.id", "desc"
                 sort_update
                 retrieve_query
                 render :action => 'list_issues' and return unless @query.valid?
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :assigned_to, :author, :status, :tracker, :priority, :project, {:custom_values => :custom_field} ],
             						:conditions => @query.statement,
             						:limit => Setting.issues_export_limit.to_i
                 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_author),
                                    l(:field_start_date),
                                    l(:field_due_date),
                                    l(:field_done_ratio),
                                    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.project.name,
                                         issue.tracker.name,
                                         issue.priority.name,
                                         issue.subject,
                                         (issue.assigned_to ? issue.assigned_to.name : ""),
                                         issue.author.name,
                                         issue.start_date ? l_date(issue.start_date) : nil,
                                         issue.due_date ? l_date(issue.due_date) : nil,
                                         issue.done_ratio,
                                         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 "#{Issue.table_name}.id", "desc"
                 sort_update
                 retrieve_query
                 render :action => 'list_issues' and return unless @query.valid?
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :priority, :project, :custom_values ],
             						:conditions => @query.statement,
             						:limit => Setting.issues_export_limit.to_i
                 @options_for_rfpdf ||= {}
                 @options_for_rfpdf[:file_name] = "export.pdf"
                 render :layout => false
               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)}
                 # 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|
                     # project dependent properties
                     unless i.project_id == new_project.id
                       i.category = nil
                       i.fixed_version = nil
                       # delete issue relations
                       i.relations_from.clear
                       i.relations_to.clear
                     end
                     # 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
-              def add_query
-                @query = Query.new(params[:query])
-                @query.project = @project
-                @query.user = logged_in_user
-                params[:fields].each do |field|
-                  @query.add_filter(field, params[:operators][field], params[:values][field])
-                end if params[:fields]
-                if request.post? and @query.save
-                  flash[:notice] = l(:notice_successful_create)
-                  redirect_to :controller => 'reports', :action => 'issue_report', :id => @project
-                end
-                render :layout => false if request.xhr?
-              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.table_name}.created_on DESC"
                 render :action => "list_news", :layout => false if request.xhr?
               end
               def add_file
                 if request.post?
                   @version = @project.versions.find_by_id(params[:version_id])
                   # Save the attachments
                   @attachments = []
                   params[:attachments].each { |file|
                     next unless file.size > 0
                     a = Attachment.create(:container => @version, :file => file, :author => logged_in_user)
                     @attachments << a unless a.new_record?
                   } if params[:attachments] and params[:attachments].is_a? Array
                   Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
                   redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                 end
                 @versions = @project.versions.sort
               end
               def list_files
                 @versions = @project.versions.sort
               end
               # Show changelog for @project
               def changelog
                 @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 @versions = @project.versions.sort
               end
               def roadmap
                 @trackers = Tracker.find(:all, :conditions => ["is_in_roadmap=?", true], :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 conditions = ("1" == params[:completed] ? nil : [ "#{Version.table_name}.effective_date > ? OR #{Version.table_name}.effective_date IS NULL", Date.today])
                 @versions = @project.versions.find(:all, :conditions => conditions).sort
               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
                 @events_by_day = {}
                 unless params[:show_issues] == "0"
                   @project.issues.find(:all, :include => [:author], :conditions => ["#{Issue.table_name}.created_on>=? and #{Issue.table_name}.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.table_name}.created_on>=? and #{News.table_name}.created_on<=?", @date_from, @date_to], :include => :author ).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, :select => "#{Attachment.table_name}.*", :joins => "LEFT JOIN #{Version.table_name} ON #{Version.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Version' and #{Version.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.created_on<=?", @project.id, @date_from, @date_to], :include => :author ).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"
                   @project.documents.find(:all, :conditions => ["#{Document.table_name}.created_on>=? and #{Document.table_name}.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
                   }
                   Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN #{Document.table_name} ON #{Document.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Document' and #{Document.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.created_on<=?", @project.id, @date_from, @date_to], :include => :author ).each { |i|
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_documents = 1
                 end
                 unless @project.wiki.nil? || params[:show_wiki_edits] == "0"
                   select = "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comments, " +
                            "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title"
                   joins = "LEFT JOIN #{WikiPage.table_name} ON #{WikiPage.table_name}.id = #{WikiContent.versioned_table_name}.page_id " +
                           "LEFT JOIN #{Wiki.table_name} ON #{Wiki.table_name}.id = #{WikiPage.table_name}.wiki_id "
                   conditions = ["#{Wiki.table_name}.project_id = ? AND #{WikiContent.versioned_table_name}.updated_on BETWEEN ? AND ?",
                                 @project.id, @date_from, @date_to]
                   WikiContent.versioned_class.find(:all, :select => select, :joins => joins, :conditions => conditions).each { |i|
                     # We provide this alias so all events can be treated in the same manner
                     def i.created_on
                       self.updated_on
                     end
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_wiki_edits = 1
                 end
                 unless @project.repository.nil? || params[:show_changesets] == "0"
                   @project.repository.changesets.find(:all, :conditions => ["#{Changeset.table_name}.committed_on BETWEEN ? AND ?", @date_from, @date_to]).each { |i|
                     def i.created_on
                       self.committed_on
                     end
                     @events_by_day[i.created_on.to_date] ||= []
                     @events_by_day[i.created_on.to_date] << i
                   }
                   @show_changesets = 1
                 end
                 render :layout => false if request.xhr?
               end
               def calendar
                 @trackers = Tracker.find(:all, :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 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)
                 @events = []
                 @project.issues_with_subprojects(params[:with_subprojects]) do
                   @events += Issue.find(:all,
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
                                        :conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)) and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", @date_from, @date_to, @date_from, @date_to]
                                        ) unless @selected_tracker_ids.empty?
                 end
                 @events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
                 @ending_events_by_days = @events.group_by {|event| event.due_date}
                 @starting_events_by_days = @events.group_by {|event| event.start_date}
                 render :layout => false if request.xhr?
               end
               def gantt
                 @trackers = Tracker.find(:all, :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 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
                 @events = []
                 @project.issues_with_subprojects(params[:with_subprojects]) do
                   @events += Issue.find(:all,
                                        :order => "start_date, due_date",
                                        :include => [:tracker, :status, :assigned_to, :priority, :project],
                                        :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 and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
                                        ) unless @selected_tracker_ids.empty?
                 end
                 @events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
                 @events.sort! {|x,y| x.start_date <=> y.start_date }
                 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
               def feeds
                 @queries = @project.queries.find :all, :conditions => ["is_public=? or user_id=?", true, (logged_in_user ? logged_in_user.id : 0)]
                 @key = logged_in_user.get_or_create_rss_key.value if logged_in_user
               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 ActiveRecord::RecordNotFound
                 render_404
               end
               def retrieve_selected_tracker_ids(selectable_trackers)
                 if ids = params[:tracker_ids]
                   @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
                 else
                   @selected_tracker_ids = selectable_trackers.collect {|t| t.id.to_s }
                 end
               end
               # Retrieve query from session or build a new query
               def retrieve_query
                 if params[:query_id]
                   @query = @project.queries.find(params[:query_id])
                   @query.executed_by = logged_in_user
                   session[:query] = @query
                 else
                   if params[:set_filter] or !session[:query] or session[:query].project_id != @project.id
                     # Give it a name, required to be valid
                     @query = Query.new(:name => "_", :executed_by => logged_in_user)
                     @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] = @query
                   else
                     @query = session[:query]
                   end
                 end
               end
             end

app/controllers/queries_controller.rb +36 -6

             # redMine - project management software
-            # Copyright (C) 2006  Jean-Philippe Lang
+            # 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'
-              before_filter :require_login, :find_query
+              before_filter :require_login, :except => :index
+              before_filter :find_project, :check_project_privacy
+              def index
+                @queries = @project.queries.find(:all,
+                                                 :order => "name ASC",
+                                                 :conditions => ["is_public = ? or user_id = ?", true, (logged_in_user ? logged_in_user.id : 0)])
+              end
+              def new
+                @query = Query.new(params[:query])
+                @query.project = @project
+                @query.user = logged_in_user
+                @query.executed_by = logged_in_user
+                @query.is_public = false unless logged_in_user.authorized_to(@project, 'projects/add_query')
+                params[:fields].each do |field|
+                  @query.add_filter(field, params[:operators][field], params[:values][field])
+                end if params[:fields]
+                if request.post? and @query.save
+                  flash[:notice] = l(:notice_successful_create)
+                  redirect_to :controller => 'projects', :action => 'list_issues', :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 logged_in_user.authorized_to(@project, 'projects/add_query')
                   if @query.save
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => @query
                   end
                 end
               end
               def destroy
                 @query.destroy if request.post?
-                redirect_to :controller => 'reports', :action => 'issue_report', :id => @project
+                redirect_to :controller => 'queries', :project_id => @project
               end
             private
-              def find_query
+              def find_project
+                if params[:id]
                   @query = Query.find(params[:id])
                   @query.executed_by = logged_in_user
                   @project = @query.project
-                # check if user is allowed to manage queries (same permission as add_query)
+                  render_403 unless @query.editable_by?(logged_in_user)
-                authorize('projects', 'add_query')
+                else
+                  @project = Project.find(params[:project_id])
+                end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/controllers/reports_controller.rb 0 -1

             # 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 ReportsController < ApplicationController
               layout 'base'
               before_filter :find_project, :authorize
               def issue_report
                 @statuses = IssueStatus.find(:all, :order => 'position')
                 case params[:detail]
                 when "tracker"
                   @field = "tracker_id"
                   @rows = Tracker.find :all, :order => 'position'
                   @data = issues_by_tracker
                   @report_title = l(:field_tracker)
                   render :template => "reports/issue_report_details"
                 when "version"
                   @field = "fixed_version_id"
                   @rows = @project.versions.sort
                   @data = issues_by_version
                   @report_title = l(:field_version)
                   render :template => "reports/issue_report_details"
                 when "priority"
                   @field = "priority_id"
                   @rows = Enumeration::get_values('IPRI')
                   @data = issues_by_priority
                   @report_title = l(:field_priority)
                   render :template => "reports/issue_report_details"
                 when "category"
                   @field = "category_id"
                   @rows = @project.issue_categories
                   @data = issues_by_category
                   @report_title = l(:field_category)
                   render :template => "reports/issue_report_details"
                 when "author"
                   @field = "author_id"
                   @rows = @project.members.collect { |m| m.user }
                   @data = issues_by_author
                   @report_title = l(:field_author)
                   render :template => "reports/issue_report_details"
                 when "subproject"
                   @field = "project_id"
                   @rows = @project.active_children
                   @data = issues_by_subproject
                   @report_title = l(:field_subproject)
                   render :template => "reports/issue_report_details"
                 else
-                  @queries = @project.queries.find :all, :conditions => ["is_public=? or user_id=?", true, (logged_in_user ? logged_in_user.id : 0)]
                   @trackers = Tracker.find(:all, :order => 'position')
                   @versions = @project.versions.sort
                   @priorities = Enumeration::get_values('IPRI')
                   @categories = @project.issue_categories
                   @authors = @project.members.collect { |m| m.user }
                   @subprojects = @project.active_children
                   issues_by_tracker
                   issues_by_version
                   issues_by_priority
                   issues_by_category
                   issues_by_author
                   issues_by_subproject
                   @total_hours = @project.time_entries.sum(:hours)
                   render :template => "reports/issue_report"
                 end
               end
               def delays
                 @trackers = Tracker.find(:all)
                 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 ||= []
                 @raw =
                   ActiveRecord::Base.connection.select_all("SELECT datediff( a.created_on, b.created_on ) as delay, count(a.id) as total
                   FROM issue_histories a, issue_histories b, issues i
                   WHERE a.status_id =5
                   AND a.issue_id = b.issue_id
                   AND a.issue_id = i.id
                   AND i.tracker_id in (#{@selected_tracker_ids.join(',')})
                   AND b.id = (
                   SELECT min( c.id )
                   FROM issue_histories c
                   WHERE b.issue_id = c.issue_id )
                   GROUP BY delay") unless @selected_tracker_ids.empty?
                 @raw ||=[]
                 @x_from = 0
                 @x_to = 0
                 @y_from = 0
                 @y_to = 0
                 @sum_total = 0
                 @sum_delay = 0
                 @raw.each do |r|
                   @x_to = [r['delay'].to_i, @x_to].max
                   @y_to = [r['total'].to_i, @y_to].max
                   @sum_total = @sum_total + r['total'].to_i
                   @sum_delay = @sum_delay + r['total'].to_i * r['delay'].to_i
                 end
               end
             private
               # Find project of id params[:id]
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def issues_by_tracker
                 @issues_by_tracker ||=
                     ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               t.id as tracker_id,
                                                               count(i.id) as total
                                                             from
                                                               #{Issue.table_name} i, #{IssueStatus.table_name} s, #{Tracker.table_name} t
                                                             where
                                                               i.status_id=s.id
                                                               and i.tracker_id=t.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, t.id")
               end
               def issues_by_version
                 @issues_by_version ||=
                     ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               v.id as fixed_version_id,
                                                               count(i.id) as total
                                                             from
                                                               #{Issue.table_name} i, #{IssueStatus.table_name} s, #{Version.table_name} v
                                                             where
                                                               i.status_id=s.id
                                                               and i.fixed_version_id=v.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, v.id")
               end
               def issues_by_priority
                 @issues_by_priority ||=
                   ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               p.id as priority_id,
                                                               count(i.id) as total
                                                             from
                                                               #{Issue.table_name} i, #{IssueStatus.table_name} s, #{Enumeration.table_name} p
                                                             where
                                                               i.status_id=s.id
                                                               and i.priority_id=p.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, p.id")
               end
               def issues_by_category
                 @issues_by_category ||=
                   ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               c.id as category_id,
                                                               count(i.id) as total
                                                             from
                                                               #{Issue.table_name} i, #{IssueStatus.table_name} s, #{IssueCategory.table_name} c
                                                             where
                                                               i.status_id=s.id
                                                               and i.category_id=c.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, c.id")
               end
               def issues_by_author
                 @issues_by_author ||=
                   ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               a.id as author_id,
                                                               count(i.id) as total
                                                             from
                                                               #{Issue.table_name} i, #{IssueStatus.table_name} s, #{User.table_name} a
                                                             where
                                                               i.status_id=s.id
                                                               and i.author_id=a.id
                                                               and i.project_id=#{@project.id}
                                                             group by s.id, s.is_closed, a.id")
               end
               def issues_by_subproject
                 @issues_by_subproject ||=
                   ActiveRecord::Base.connection.select_all("select    s.id as status_id,
                                                               s.is_closed as closed,
                                                               i.project_id as project_id,
                                                               count(i.id) as total
                                                             from
                                                               #{Issue.table_name} i, #{IssueStatus.table_name} s
                                                             where
                                                               i.status_id=s.id
                                                               and i.project_id IN (#{@project.active_children.collect{|p| p.id}.join(',')})
                                                             group by s.id, s.is_closed, i.project_id") if @project.active_children.any?
                 @issues_by_subproject ||= []
               end
             end

app/models/query.rb +6 -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 Query < ActiveRecord::Base
               belongs_to :project
               belongs_to :user
               serialize :filters
               attr_protected :project, :user
               attr_accessor :executed_by
               validates_presence_of :name, :on => :save
               @@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,
                               ">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_one_or_more => [ "*", "=" ],
                                              :date => [ "<t+", ">t+", "t+", "t", ">t-", "<t-", "t-" ],
                                              :date_past => [ ">t-", "<t-", "t-", "t" ],
                                              :string => [ "=", "~", "!", "!~" ],
                                              :text => [  "~", "!~" ] }
               cattr_reader :operators_by_filter_type
               def initialize(attributes = nil)
                 super attributes
                 self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
-                self.is_public = true
               end
               def executed_by=(user)
                 @executed_by = user
                 set_language_if_valid(user.language) if user
               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"].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
+                is_public && user.authorized_to(project, "projects/add_query")
+              end
               def available_filters
                 return @available_filters if @available_filters
                 @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 => Tracker.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },
                                        "priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI']).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 } }
                 unless project.nil?
                   # project specific filters
                   user_values = []
                   user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by
                   user_values += @project.users.collect{|s| [s.name, s.id.to_s] }
                   @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values }
                   @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values }
                   @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
                   @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.sort.collect{|s| [s.name, s.id.to_s] } }
                   unless @project.active_children.empty?
                     @available_filters["subproject_id"] = { :type => :list_one_or_more, :order => 13, :values => @project.active_children.collect{|s| [s.name, s.id.to_s] } }
                   end
                   @project.all_custom_fields.select(&:is_filter?).each do |field|
                     case field.field_format
                     when "string", "int"
                       options = { :type => :string, :order => 20 }
                     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 }
                     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 statement
                 sql = "1=1"
                 if has_filter?("subproject_id")
                   subproject_ids = []
                   if operator_for("subproject_id") == "="
                     subproject_ids = values_for("subproject_id").each(&:to_i)
                   else
                     subproject_ids = project.active_children.collect{|p| p.id}
                   end
                   sql << " AND #{Issue.table_name}.project_id IN (%d,%s)" % [project.id, subproject_ids.join(",")] if project
                 else
                   sql << " AND #{Issue.table_name}.project_id=%d" % project.id if project
                 end
                 filters.each_key do |field|
                   next if field == "subproject_id"
                   v = values_for(field).clone
                   next unless v and !v.empty?
                   sql = sql + " AND " unless sql.empty?
                   sql << "("
                   if field =~ /^cf_(\d+)$/
                     # custom field
                     db_table = CustomValue.table_name
                     db_field = "value"
                     sql << "#{db_table}.custom_field_id = #{$1} AND "
                   else
                     # regular field
                     db_table = Issue.table_name
                     db_field = field
                   end
                   # "me" value subsitution
                   if %w(assigned_to_id author_id).include?(field)
                     v.push(executed_by ? executed_by.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} 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 "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 "~"
                     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 << ")"
                 end if filters and valid?
                 sql
               end
             end

app/models/user.rb +7 0

             # 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.
             require "digest/sha1"
             class User < ActiveRecord::Base
               # Account statuses
               STATUS_ACTIVE     = 1
               STATUS_REGISTERED = 2
               STATUS_LOCKED     = 3
               has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name", :dependent => :delete_all
               has_many :projects, :through => :memberships
               has_many :custom_values, :dependent => :delete_all, :as => :customized
               has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
               has_one :rss_key, :dependent => :destroy, :class_name => 'Token', :conditions => "action='feeds'"
               belongs_to :auth_source
               attr_accessor :password, :password_confirmation
               attr_accessor :last_before_login_on
               # Prevents unauthorized assignments
               attr_protected :login, :admin, :password, :password_confirmation, :hashed_password
               validates_presence_of :login, :firstname, :lastname, :mail
               validates_uniqueness_of :login, :mail
               # Login must contain lettres, numbers, underscores only
               validates_format_of :login, :with => /^[a-z0-9_\-@\.]+$/i
               validates_length_of :login, :maximum => 30
               validates_format_of :firstname, :lastname, :with => /^[\w\s\'\-]*$/i
               validates_length_of :firstname, :lastname, :maximum => 30
               validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
               validates_length_of :mail, :maximum => 60
               # Password length between 4 and 12
               validates_length_of :password, :in => 4..12, :allow_nil => true
               validates_confirmation_of :password, :allow_nil => true
               validates_associated :custom_values, :on => :update
               def before_save
                 # update hashed_password if password was set
                 self.hashed_password = User.hash_password(self.password) if self.password
               end
               def self.active
                 with_scope :find => { :conditions => [ "status = ?", STATUS_ACTIVE ] } do
                   yield
                 end
               end
               def self.find_active(*args)
                 active do
                   find(*args)
                 end
               end
               # Returns the user that matches provided login and password, or nil
               def self.try_to_login(login, password)
                 user = find(:first, :conditions => ["login=?", login])
                 if user
                   # user is already in local database
                   return nil if !user.active?
                   if user.auth_source
                     # user has an external authentication method
                     return nil unless user.auth_source.authenticate(login, password)
                   else
                     # authentication with local password
                     return nil unless User.hash_password(password) == user.hashed_password
                   end
                 else
                   # user is not yet registered, try to authenticate with available sources
                   attrs = AuthSource.authenticate(login, password)
                   if attrs
                     onthefly = new(*attrs)
                     onthefly.login = login
                     onthefly.language = Setting.default_language
                     if onthefly.save
                       user = find(:first, :conditions => ["login=?", login])
                       logger.info("User '#{user.login}' created on the fly.") if logger
                     end
                   end
                 end
                 user.update_attribute(:last_login_on, Time.now) if user
                 user
                 rescue => text
                   raise text
               end
               # Return user's full name for display
               def display_name
                 firstname + " " + lastname
               end
               def name
                 display_name
               end
               def active?
                 self.status == STATUS_ACTIVE
               end
               def registered?
                 self.status == STATUS_REGISTERED
               end
               def locked?
                 self.status == STATUS_LOCKED
               end
               def check_password?(clear_password)
                 User.hash_password(clear_password) == self.hashed_password
               end
               def role_for_project(project)
+                return nil unless project
                 member = memberships.detect {|m| m.project_id == project.id}
                 member ? member.role : nil
               end
+              def authorized_to(project, action)
+                return true if self.admin?
+                role = role_for_project(project)
+                role && Permission.allowed_to_role(action, role)
+              end
               def pref
                 self.preference ||= UserPreference.new(:user => self)
               end
               def get_or_create_rss_key
                 self.rss_key || Token.create(:user => self, :action => 'feeds')
               end
               def self.find_by_rss_key(key)
                 token = Token.find_by_value(key)
                 token && token.user.active? ? token.user : nil
               end
               def self.find_by_autologin_key(key)
                 token = Token.find_by_action_and_value('autologin', key)
                 token && (token.created_on > Setting.autologin.to_i.day.ago) && token.user.active? ? token.user : nil
               end
               def <=>(user)
                 lastname == user.lastname ? firstname <=> user.firstname : lastname <=> user.lastname
               end
             private
               # Return password digest
               def self.hash_password(clear_password)
                 Digest::SHA1.hexdigest(clear_password || "")
               end
             end

app/views/layouts/base.rhtml +11 0

             <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
             <head>
             <title><%= Setting.app_title + (@html_title ? ": #{@html_title}" : "") %></title>
             <meta http-equiv="content-type" content="text/html; charset=utf-8" />
             <meta name="description" content="redMine" />
             <meta name="keywords" content="issue,bug,tracker" />
             <!--[if IE]>
                 <style type="text/css">
                 body {behavior: url(<%= stylesheet_path "csshover.htc" %>);}
                 </style>
             <![endif]-->
             <%= stylesheet_link_tag "application" %>
             <%= stylesheet_link_tag "print", :media => "print" %>
             <%= javascript_include_tag :defaults %>
             <%= javascript_include_tag 'menu' %>
             <%= stylesheet_link_tag 'jstoolbar' %>
             <!-- page specific tags --><%= yield :header_tags %>
             </head>
             <body>
             <div id="container" >
                 <div id="header">
                 <div style="float: left;">
                     <h1><%= Setting.app_title %></h1>
                     <h2><%= Setting.app_subtitle %></h2>
                 </div>
                 <div style="float: right; padding-right: 1em; padding-top: 0.2em;">
                   <% if loggedin? %><small><%=l(:label_logged_as)%> <strong><%= @logged_in_user.login %></strong> -</small><% end %>
                   <small><%= toggle_link l(:label_search), 'quick-search-form', :focus => 'quick-search-input' %></small>
                   <% form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get, :id => 'quick-search-form', :style => "display:none;" ) do %>
                     <%= text_field_tag 'q', @question, :size => 15, :class => 'small', :id => 'quick-search-input' %>
                   <% end %>
                 </div>
                 </div>
             	<div id="navigation">
             		<ul>
             	<li><%= link_to l(:label_home), { :controller => 'welcome' }, :class => "icon icon-home" %></li>
             	<li><%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => "icon icon-mypage" %></li>
             	<% if loggedin? and @logged_in_user.memberships.any? %>
                   <li class="submenu"><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "icon icon-projects", :onmouseover => "buttonMouseover(event, 'menuAllProjects');" %></li>
             	<% else %>
             	  <li><%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => "icon icon-projects" %></li>
             	<% end %>
                 <% unless @project.nil? || @project.id.nil? %>
                     <li class="submenu"><%= link_to @project.name, { :controller => 'projects', :action => 'show', :id => @project }, :class => "icon icon-projects", :onmouseover => "buttonMouseover(event, 'menuProject');"  %></li>
                 <% end %>
                 <% if loggedin? %>
             		<li><%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => "icon icon-user" %></li>
                 <% end %>
             	<% if admin_loggedin? %>
             		<li class="submenu"><%= link_to l(:label_administration), { :controller => 'admin' }, :class => "icon icon-admin", :onmouseover => "buttonMouseover(event, 'menuAdmin');" %></li>
             	<% end %>
             	<li class="right"><%= link_to l(:label_help), { :controller => 'help', :ctrl => params[:controller], :page => params[:action] }, :onclick => "window.open(this.href); return false;", :class => "icon icon-help" %></li>
             	<% if loggedin? %>
             		<li class="right"><%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => "icon icon-user" %></li>
             	<% else %>
             		<li class="right"><%= link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => "icon icon-user" %></li>
             	<% end %>
             		</ul>
             	</div>
                 <% if admin_loggedin? %>
             		<%= render :partial => 'admin/menu' %>
                 <% end %>
                 <% unless @project.nil? || @project.id.nil? %>
                 <div id="menuProject" class="menu" onmouseover="menuMouseover(event)">
                     <%= link_to l(:label_calendar), {:controller => 'projects', :action => 'calendar', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_gantt), {:controller => 'projects', :action => 'gantt', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_issue_plural), {:controller => 'projects', :action => 'list_issues', :id => @project }, :class => "menuItem" %>
+                    <% if @project && authorize_for('projects', 'add_issue') %>
+                      <a class="menuItem" href="#" onmouseover="menuItemMouseover(event,'menuNewIssue');" onclick="this.blur(); return false;"><span class="menuItemText"><%= l(:label_issue_new) %></span><span class="menuItemArrow">&#9654;</span></a>
+                    <% end %>
                     <%= link_to l(:label_report_plural), {:controller => 'reports', :action => 'issue_report', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_activity), {:controller => 'projects', :action => 'activity', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_news_plural), {:controller => 'projects', :action => 'list_news', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_change_log), {:controller => 'projects', :action => 'changelog', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_roadmap), {:controller => 'projects', :action => 'roadmap', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_document_plural), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_wiki), {:controller => 'wiki', :id => @project, :page => nil }, :class => "menuItem" if @project.wiki and !@project.wiki.new_record? %>
                     <%= link_to l(:label_board_plural), {:controller => 'boards', :project_id => @project }, :class => "menuItem" unless @project.boards.empty? %>
                     <%= link_to l(:label_attachment_plural), {:controller => 'projects', :action => 'list_files', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_search), {:controller => 'search', :action => 'index', :id => @project }, :class => "menuItem" %>
                     <%= link_to l(:label_repository), {:controller => 'repositories', :action => 'show', :id => @project}, :class => "menuItem" if @project.repository and !@project.repository.new_record? %>
                     <%= link_to_if_authorized l(:label_settings), {:controller => 'projects', :action => 'settings', :id => @project }, :class => "menuItem" %>
                 </div>
                 <% end %>
+                <% if @project && authorize_for('projects', 'add_issue') %>
+                    <div id="menuNewIssue" class="menu" onmouseover="menuMouseover(event)">
+                    <% Tracker.find(:all, :order => 'position').each do |tracker| %>
+                        <%= link_to tracker.name, {:controller => 'projects', :action => 'add_issue', :id => @project, :tracker_id => tracker}, :class => "menuItem" %>
+                    <% end %>
+                    </div>
+                <% end %>
                 <% if loggedin? and @logged_in_user.memberships.any? %>
                     <div id="menuAllProjects" class="menu" onmouseover="menuMouseover(event)">
                     <%= link_to l(:label_project_all), {:controller => 'projects' }, :class => "menuItem" %>
                     <% @logged_in_user.memberships.find(:all, :limit => 20).each do |membership| %>
                         <%= link_to membership.project.name, {:controller => 'projects',:action => 'show', :id => membership.project }, :class => "menuItem" %>
                     <% end %>
                     </div>
                 <% end %>
             	<div id="subcontent">
             		<% unless @project.nil? || @project.id.nil? %>
             			<h2><%= @project.name %></h2>
             			<ul class="menublock">
             				<li><%= link_to l(:label_overview), :controller => 'projects', :action => 'show', :id => @project %></li>
             				<li><%= link_to l(:label_calendar), :controller => 'projects', :action => 'calendar', :id => @project %></li>
             				<li><%= link_to l(:label_gantt), :controller => 'projects', :action => 'gantt', :id => @project %></li>
             				<li><%= link_to l(:label_issue_plural), :controller => 'projects', :action => 'list_issues', :id => @project %></li>
             				<li><%= link_to l(:label_report_plural), :controller => 'reports', :action => 'issue_report', :id => @project %></li>
             				<li><%= link_to l(:label_activity), :controller => 'projects', :action => 'activity', :id => @project %></li>
             				<li><%= link_to l(:label_news_plural), :controller => 'projects', :action => 'list_news', :id => @project %></li>
             				<li><%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %></li>
             				<li><%= link_to l(:label_roadmap), :controller => 'projects', :action => 'roadmap', :id => @project %></li>
             				<li><%= link_to l(:label_document_plural), :controller => 'projects', :action => 'list_documents', :id => @project %></li>
             				<%= content_tag("li", link_to(l(:label_wiki), :controller => 'wiki', :id => @project, :page => nil)) if @project.wiki and !@project.wiki.new_record? %>
             				<%= content_tag("li", link_to(l(:label_board_plural), :controller => 'boards', :project_id => @project)) unless @project.boards.empty? %>
             				<li><%= link_to l(:label_attachment_plural), :controller => 'projects', :action => 'list_files', :id => @project %></li>
             				<li><%= link_to l(:label_search), :controller => 'search', :action => 'index', :id => @project %></li>
             				<%= content_tag("li", link_to(l(:label_repository), :controller => 'repositories', :action => 'show', :id => @project)) if @project.repository and !@project.repository.new_record? %>
             				<li><%= link_to_if_authorized l(:label_settings), :controller => 'projects', :action => 'settings', :id => @project %></li>
             			</ul>
             		<% end %>
             	</div>
             	<div id="content">
             		<% if flash[:notice] %><p style="color: green"><%= flash[:notice] %></p><% end %>
             		<%= yield %>
             	</div>
             	<div id="ajax-indicator" style="display:none;">
             	   <span><%= l(:label_loading) %></span>
             	</div>
             	<div id="footer">
             		<p><a href="http://redmine.rubyforge.org/">redMine</a> <small><%= Redmine::VERSION %> &copy 2006-2007 Jean-Philippe Lang</small></p>
             	</div>
             </div>
             </body>
             </html>

app/views/projects/list_issues.rhtml +5 -9

             <% if @query.new_record? %>
                 <div class="contextual">
-                <%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>
+                  <%= link_to l(:label_query_plural), :controller => 'queries', :project_id => @project %>
                 </div>
                 <h2><%=l(:label_issue_plural)%></h2>
                 <% form_tag({:action => 'list_issues'}, :id => 'query_form') do %>
                 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
                 <% end %>
                 <div class="contextual">
                 <%= link_to_remote l(:button_apply),
                                    { :url => { :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 },
                                      :update => "content",
                                      :with => "Form.serialize('query_form')"
                                    }, :class => 'icon icon-edit' %>
                 <%= link_to_remote l(:button_clear),
                                    { :url => {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1},
                                      :update => "content",
                                    }, :class => 'icon icon-reload'  %>
-                <% if authorize_for('projects', 'add_query') %>
+                <% if loggedin? %>
                 <%= link_to_remote l(:button_save),
-                                   { :url => { :controller => 'projects', :action => "add_query", :id => @project },
+                                   { :url => { :controller => 'queries', :action => 'new', :project_id => @project },
                                      :method => 'get',
                                      :update => "content",
                                      :with => "Form.serialize('query_form')"
                                    }, :class => 'icon icon-save' %>
                 <% end %>
                 </div>
                 <br />
             <% else %>
                 <div class="contextual">
-                    <%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>
+                    <%= link_to l(:label_query_plural), {:controller => 'queries', :project_id => @project} %> |
-                    <%= link_to l(:button_clear), {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1}, :class => 'icon icon-reload' %>
+                    <%= link_to l(:label_issue_view_all), {:controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1} %>
-                    <% if authorize_for('projects', 'add_query') %>
-                        <%= 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><%= @query.name %></h2>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <% if @issues.empty? %>
             <p><i><%= l(:label_no_data) %></i></p>
             <% else %>
             &nbsp;
             <% form_tag({:controller => 'projects', :action => 'move_issues', :id => @project}, :id => 'issues_form' ) do %>
             <table class="list">
                 <thead><tr>
                     <th></th>
             		<%= sort_header_tag("#{Issue.table_name}.id", :caption => '#') %>
             		<%= sort_header_tag("#{Issue.table_name}.tracker_id", :caption => l(:field_tracker)) %>
             		<%= sort_header_tag("#{IssueStatus.table_name}.name", :caption => l(:field_status)) %>
             		<%= sort_header_tag("#{Issue.table_name}.priority_id", :caption => l(:field_priority)) %>
             		<th><%=l(:field_subject)%></th>
             		<%= sort_header_tag("#{User.table_name}.lastname", :caption => l(:field_assigned_to)) %>
             		<%= sort_header_tag("#{Issue.table_name}.updated_on", :caption => l(:field_updated_on)) %>
             	</tr></thead>
             	<tbody>
             	<% for issue in @issues %>
             	<tr class="<%= cycle("odd", "even") %>">
             	    <th style="width:15px;"><%= check_box_tag "issue_ids[]", issue.id, false, :id => "issue_#{issue.id}" %></th>
             		<td align="center"><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
             		<td align="center"><%= issue.tracker.name %></td>
             		<td><div class="square" style="background:#<%= issue.status.html_color %>;"></div> <%= issue.status.name %></td>
             		<td align="center"><%= issue.priority.name %></td>
             		<td><%= "#{issue.project.name} - " unless @project && @project == issue.project %><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></td>
             		<td align="center"><%= issue.assigned_to.name if issue.assigned_to %></td>
             		<td align="center"><%= format_time(issue.updated_on) %></td>
             	</tr>
             	<% end %>
             	</tbody>
             </table>
             <div class="contextual">
             <%= l(:label_export_to) %>
             <%= link_to 'CSV', {:action => 'export_issues_csv', :id => @project}, :class => 'icon icon-csv' %>,
             <%= link_to 'PDF', {:action => 'export_issues_pdf', :id => @project}, :class => 'icon icon-pdf' %>
             </div>
             <p><%= submit_tag l(:button_move), :class => "button-small" %>
             &nbsp;
             <%= pagination_links_full @issue_pages %>
             [ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]
             </p>
             <% end %>
             <% end %>
             <% end %>

app/views/projects/show.rhtml 0 -3

             <div class="contextual">
             <%= link_to l(:label_feed_plural), {:action => 'feeds', :id => @project}, :class => 'icon icon-feed' %>
             </div>
             <h2><%=l(:label_overview)%></h2>
             <div class="splitcontentleft">
             	<%= textilizable @project.description %>
             	<ul>
             	<% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= auto_link @project.homepage %></li><% end %>
             	<li><%=l(:field_created_on)%>: <%= format_date(@project.created_on) %></li>
             	<% unless @project.parent.nil? %>
             	<li><%=l(:field_parent)%>: <%= link_to @project.parent.name, :controller => 'projects', :action => 'show', :id => @project.parent %></li>
             	<% end %>
             	<% for custom_value in @custom_values %>
             	<% if !custom_value.value.empty? %>
             	   <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
             	<% end %>
             	<% end %>
             	</ul>
               <div class="box">
-                <div class="contextual">
-                <%= render :partial => 'issues/add_shortcut', :locals => {:trackers => @trackers } %>
-                </div>
                 <h3 class="icon22 icon22-tracker"><%=l(:label_issue_tracking)%></h3>
                 <ul>
                 <% for tracker in @trackers %>
                   <li><%= link_to tracker.name, :controller => 'projects', :action => 'list_issues', :id => @project,
                                                             :set_filter => 1,
                                                             "tracker_id" => tracker.id %>:
                   <%= @open_issues_by_tracker[tracker] || 0 %> <%= lwr(:label_open_issues, @open_issues_by_tracker[tracker] || 0) %>
                   <%= l(:label_on) %> <%= @total_issues_by_tracker[tracker] || 0 %></li>
                 <% end %>
                 </ul>
                 <p class="textcenter"><small><%= link_to l(:label_issue_view_all), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %></small></p>
               </div>
             </div>
             <div class="splitcontentright">
             	<div class="box">
             		<h3 class="icon22 icon22-users"><%=l(:label_member_plural)%></h3>
             		<% @members_by_role.keys.sort.each do |role| %>
             		<%= role.name %>: <%= @members_by_role[role].collect(&:user).sort.collect{|u| link_to_user u}.join(", ") %><br />
             		<% end %>
             	</div>
               <% if @subprojects.any? %>
              	<div class="box">
             		<h3 class="icon22 icon22-projects"><%=l(:label_subproject_plural)%></h3>
             		<%= @subprojects.collect{|p| link_to(p.name, :action => 'show', :id => p)}.join(", ") %>
             	</div>
               <% end %>
               <% if @news.any? %>
               <div class="box">
                 <h3><%=l(:label_news_latest)%></h3>
                 <%= render :partial => 'news/news', :collection => @news %>
                 <p class="textcenter"><small><%= link_to l(:label_news_view_all), :controller => 'projects', :action => 'list_news', :id => @project %></small></p>
               </div>
               <% end %>
             </div>

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

             <script type="text/javascript">
             //<![CDATA[
             function add_filter() {
                 select = $('add_filter_select');
                 field = select.value
                 Element.show('tr_' +  field);
                 check_box = $('cb_' + field);
                 check_box.checked = true;
                 toggle_filter(field);
                 select.selectedIndex = 0;
                 for (i=0; i<select.options.length; i++) {
                     if (select.options[i].value == field) {
                         select.options[i].disabled = true;
                     }
                 }
             }
             function toggle_filter(field) {
                 check_box = $('cb_' + field);
                 if (check_box.checked) {
                     Element.show("operators_" + field);
                     toggle_operator(field);
                 } else {
                     Element.hide("operators_" + field);
                     Element.hide("div_values_" + field);
               }
             }
             function toggle_operator(field) {
               operator = $("operators_" + field);
               switch (operator.value) {
                 case "!*":
                 case "*":
                 case "t":
                 case "o":
                 case "c":
                   Element.hide("div_values_" + field);
                   break;
                 default:
                   Element.show("div_values_" + field);
                   break;
               }
             }
             function toggle_multi_select(field) {
                 select = $('values_' + field);
                 if (select.multiple == true) {
                     select.multiple = false;
                 } else {
                     select.multiple = true;
                 }
             }
             //]]>
             </script>
-            <fieldset style="margin:0;"><legend><%= l(:label_filter_plural) %></legend>
+            <fieldset><legend><%= l(:label_filter_plural) %></legend>
             <table width="100%">
             <tr>
             <td>
             <table style="padding:0;">
             <% query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.each do |filter| %>
                 <% field = filter[0]
                    options = filter[1] %>
                 <tr <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>">
                 <td valign="top" style="width:200px;">
                     <%= check_box_tag 'fields[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %>
                     <label for="cb_<%= field %>"><%= filter[1][:name] || l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label>
                 </td>
                 <td valign="top" style="width:150px;">
                     <%= select_tag "operators[#{field}]", options_for_select(operators_for_select(options[:type]), query.operator_for(field)), :id => "operators_#{field}", :onchange => "toggle_operator('#{field}');", :class => "select-small", :style => "vertical-align: top;" %>
                 </td>
                 <td valign="top">
                 <div id="div_values_<%= field %>" style="display:none;">
                 <% case options[:type]
                 when :list, :list_optional, :list_status, :list_one_or_more %>
                     <select <%= "multiple=true" if query.values_for(field) and query.values_for(field).length > 1 %> name="values[<%= field %>][]" id="values_<%= field %>" class="select-small" style="vertical-align: top;">
                     <%= options_for_select options[:values], query.values_for(field) %>
                     </select>
                     <%= link_to_function image_tag('expand.png'), "toggle_multi_select('#{field}');" %>
                 <% when :date, :date_past %>
                     <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %> <%= l(:label_day_plural) %>
                 <% when :string, :text %>
                     <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 30, :class => "select-small" %>
                 <% end %>
                 </div>
                 <script type="text/javascript">toggle_filter('<%= field %>');</script>
                 </td>
                 </tr>
             <% end %>
             </table>
             </td>
             <td align="right" valign="top">
             <%= l(:label_filter_add) %>:
             <%= select_tag 'add_filter_select', options_for_select([["",""]] + query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.collect{|field| [ field[1][:name] || l(("field_"+field[0].to_s.gsub(/\_id$/, "")).to_sym), field[0]] unless query.has_filter?(field[0])}.compact), :onchange => "add_filter();", :class => "select-small" %>
             </td>
             </tr>
             </table>
             </fieldset>

app/views/queries/_form.rhtml +5 -2

             <%= error_messages_for 'query' %>
-            <!--[form:query]-->
             <div class="box">
             <div class="tabular">
             <p><label for="query_name"><%=l(:field_name)%></label>
             <%= text_field 'query', 'name', :size => 80 %></p>
+            <% if authorize_for('projects', 'add_query') %>
+              <p><label for="query_is_public"><%=l(:field_is_public)%></label>
+              <%= check_box 'query', 'is_public' %></p>
+            <% end %>
             </div>
             <%= render :partial => 'queries/filters', :locals => {:query => query}%>
             </div>
-            <!--[eoform:query]-->
  No newline at end of file

app/views/queries/edit.rhtml 0 0

NO CONTENT: modified file

app/views/reports/issue_report.rhtml 0 -17

             <h2><%=l(:label_report_plural)%></h2>
-            <div class="splitcontentleft">
-            <div class="contextual">
-            <%= link_to_if_authorized l(:label_query_new), {:controller => 'projects', :action => 'add_query', :id => @project}, :class => 'icon icon-add' %>
-            </div>
-            <h3><%= l(:label_query_plural) %></h3>
-            <% if @queries.empty? %><p><i><%=l(:label_no_data)%></i></p><% end %>
-            <ul>
-            <% @queries.each do |query| %>
-                <li><%= link_to query.name, :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => query %></li>
-            <% end %>
-            </ul>
-            </div>
-            <div class="splitcontentright">
             <% if @total_hours %>
             <h3 class="textright"><%= l(:label_spent_time) %>:
             <%= link_to(lwr(:label_f_hour, @total_hours), {:controller => 'timelog', :action => 'details', :project_id => @project}, :class => 'icon icon-time') %>
             </h3>
             <% end %>
-            </div>
-            <div class="clear"></div>
             <div class="splitcontentleft">
             <h3><%=l(:field_tracker)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'tracker' %></h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %>
             <br />
             <h3><%=l(:field_version)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'version' %></h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_version, :field_name => "fixed_version_id", :rows => @versions } %>
             <br />
             <h3><%=l(:field_author)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'author' %></h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_author, :field_name => "author_id", :rows => @authors } %>
             <br />
             </div>
             <div class="splitcontentright">
             <h3><%=l(:field_priority)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'priority' %></h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %>
             <br />
             <% if @project.children.any? %>
             <h3><%=l(:field_subproject)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'subproject' %></h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_subproject, :field_name => "project_id", :rows => @subprojects } %>
             <br />
             <% end %>
             <h3><%=l(:field_category)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'category' %></h3>
             <%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %>
             <br />
             </div>

public/images/save.png binary modified 0 0

NO CONTENT: modified file, binary diff hidden

app/views/issues/_add_shortcut.rhtml removed 0 -5

NO CONTENT: file was removed

app/views/projects/add_query.rhtml removed 0 -6

NO CONTENT: file was removed

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