jro_apps/redmine Commit - r15262:03dbf8abb881

Remove special behaviour for listing issue time entries, use a filter for that....

Jean-Philippe Lang -

r15262:03dbf8abb881

parent child

Context file:

r15262:03dbf8abb881

Collapse all files

app/controllers/timelog_controller.rb +11 -8

             # Redmine - project management software
             # Copyright (C) 2006-2016  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 TimelogController < ApplicationController
               menu_item :issues
               before_filter :find_time_entry, :only => [:show, :edit, :update]
               before_filter :find_time_entries, :only => [:bulk_edit, :bulk_update, :destroy]
               before_filter :authorize, :only => [:show, :edit, :update, :bulk_edit, :bulk_update, :destroy]
-              before_filter :find_optional_project, :only => [:new, :create, :index, :report]
+              before_filter :find_optional_issue, :only => [:new, :create]
+              before_filter :find_optional_project, :only => [:index, :report]
               before_filter :authorize_global, :only => [:new, :create, :index, :report]
               accept_rss_auth :index
               accept_api_auth :index, :show, :create, :update, :destroy
               rescue_from Query::StatementInvalid, :with => :query_statement_invalid
               helper :sort
               include SortHelper
               helper :issues
               include TimelogHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :queries
               include QueriesHelper
               def index
                 retrieve_time_entry_query
                 sort_init(@query.sort_criteria.empty? ? [['spent_on', 'desc']] : @query.sort_criteria)
                 sort_update(@query.sortable_columns)
                 scope = time_entry_scope(:order => sort_clause).
                   includes(:project, :user, :issue).
                   preload(:issue => [:project, :tracker, :status, :assigned_to, :priority])
                 respond_to do |format|
                   format.html {
                     @entry_count = scope.count
                     @entry_pages = Paginator.new @entry_count, per_page_option, params['page']
                     @entries = scope.offset(@entry_pages.offset).limit(@entry_pages.per_page).to_a
                     @total_hours = scope.sum(:hours).to_f
                     render :layout => !request.xhr?
                   }
                   format.api  {
                     @entry_count = scope.count
                     @offset, @limit = api_offset_and_limit
                     @entries = scope.offset(@offset).limit(@limit).preload(:custom_values => :custom_field).to_a
                   }
                   format.atom {
                     entries = scope.limit(Setting.feeds_limit.to_i).reorder("#{TimeEntry.table_name}.created_on DESC").to_a
                     render_feed(entries, :title => l(:label_spent_time))
                   }
                   format.csv {
                     # Export all entries
                     @entries = scope.to_a
                     send_data(query_to_csv(@entries, @query, params), :type => 'text/csv; header=present', :filename => 'timelog.csv')
                   }
                 end
               end
               def report
                 retrieve_time_entry_query
                 scope = time_entry_scope
                 @report = Redmine::Helpers::TimeReport.new(@project, @issue, params[:criteria], params[:columns], scope)
                 respond_to do |format|
                   format.html { render :layout => !request.xhr? }
                   format.csv  { send_data(report_to_csv(@report), :type => 'text/csv; header=present', :filename => 'timelog.csv') }
                 end
               end
               def show
                 respond_to do |format|
                   # TODO: Implement html response
                   format.html { render :nothing => true, :status => 406 }
                   format.api
                 end
               end
               def new
                 @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
                 @time_entry.safe_attributes = params[:time_entry]
               end
               def create
                 @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
                 @time_entry.safe_attributes = params[:time_entry]
                 if @time_entry.project && !User.current.allowed_to?(:log_time, @time_entry.project)
                   render_403
                   return
                 end
                 call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
                 if @time_entry.save
                   respond_to do |format|
                     format.html {
                       flash[:notice] = l(:notice_successful_create)
                       if params[:continue]
                         options = {
                           :time_entry => {
                             :project_id => params[:time_entry][:project_id],
                             :issue_id => @time_entry.issue_id,
                             :activity_id => @time_entry.activity_id
                           },
                           :back_url => params[:back_url]
                         }
                         if params[:project_id] && @time_entry.project
                           redirect_to new_project_time_entry_path(@time_entry.project, options)
                         elsif params[:issue_id] && @time_entry.issue
                           redirect_to new_issue_time_entry_path(@time_entry.issue, options)
                         else
                           redirect_to new_time_entry_path(options)
                         end
                       else
                         redirect_back_or_default project_time_entries_path(@time_entry.project)
                       end
                     }
                     format.api  { render :action => 'show', :status => :created, :location => time_entry_url(@time_entry) }
                   end
                 else
                   respond_to do |format|
                     format.html { render :action => 'new' }
                     format.api  { render_validation_errors(@time_entry) }
                   end
                 end
               end
               def edit
                 @time_entry.safe_attributes = params[:time_entry]
               end
               def update
                 @time_entry.safe_attributes = params[:time_entry]
                 call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
                 if @time_entry.save
                   respond_to do |format|
                     format.html {
                       flash[:notice] = l(:notice_successful_update)
                       redirect_back_or_default project_time_entries_path(@time_entry.project)
                     }
                     format.api  { render_api_ok }
                   end
                 else
                   respond_to do |format|
                     format.html { render :action => 'edit' }
                     format.api  { render_validation_errors(@time_entry) }
                   end
                 end
               end
               def bulk_edit
                 @available_activities = TimeEntryActivity.shared.active
                 @custom_fields = TimeEntry.first.available_custom_fields
               end
               def bulk_update
                 attributes = parse_params_for_bulk_update(params[:time_entry])
                 unsaved_time_entry_ids = []
                 @time_entries.each do |time_entry|
                   time_entry.reload
                   time_entry.safe_attributes = attributes
                   call_hook(:controller_time_entries_bulk_edit_before_save, { :params => params, :time_entry => time_entry })
                   unless time_entry.save
                     logger.info "time entry could not be updated: #{time_entry.errors.full_messages}" if logger && logger.info?
                     # Keep unsaved time_entry ids to display them in flash error
                     unsaved_time_entry_ids << time_entry.id
                   end
                 end
                 set_flash_from_bulk_time_entry_save(@time_entries, unsaved_time_entry_ids)
                 redirect_back_or_default project_time_entries_path(@projects.first)
               end
               def destroy
                 destroyed = TimeEntry.transaction do
                   @time_entries.each do |t|
                     unless t.destroy && t.destroyed?
                       raise ActiveRecord::Rollback
                     end
                   end
                 end
                 respond_to do |format|
                   format.html {
                     if destroyed
                       flash[:notice] = l(:notice_successful_delete)
                     else
                       flash[:error] = l(:notice_unable_delete_time_entry)
                     end
                     redirect_back_or_default project_time_entries_path(@projects.first)
                   }
                   format.api  {
                     if destroyed
                       render_api_ok
                     else
                       render_validation_errors(@time_entries)
                     end
                   }
                 end
               end
             private
               def find_time_entry
                 @time_entry = TimeEntry.find(params[:id])
                 unless @time_entry.editable_by?(User.current)
                   render_403
                   return false
                 end
                 @project = @time_entry.project
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_time_entries
                 @time_entries = TimeEntry.where(:id => params[:id] || params[:ids]).to_a
                 raise ActiveRecord::RecordNotFound if @time_entries.empty?
                 raise Unauthorized unless @time_entries.all? {|t| t.editable_by?(User.current)}
                 @projects = @time_entries.collect(&:project).compact.uniq
                 @project = @projects.first if @projects.size == 1
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def set_flash_from_bulk_time_entry_save(time_entries, unsaved_time_entry_ids)
                 if unsaved_time_entry_ids.empty?
                   flash[:notice] = l(:notice_successful_update) unless time_entries.empty?
                 else
                   flash[:error] = l(:notice_failed_to_save_time_entries,
                                     :count => unsaved_time_entry_ids.size,
                                     :total => time_entries.size,
                                     :ids => '#' + unsaved_time_entry_ids.join(', #'))
                 end
               end
-              def find_optional_project
+              def find_optional_issue
                 if params[:issue_id].present?
                   @issue = Issue.find(params[:issue_id])
                   @project = @issue.project
-                elsif params[:project_id].present?
+                else
+                  find_optional_project
+                end
+              end
+              def find_optional_project
+                if params[:project_id].present?
                   @project = Project.find(params[:project_id])
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               # Returns the TimeEntry scope for index and report actions
               def time_entry_scope(options={})
-                scope = @query.results_scope(options)
+                @query.results_scope(options)
-                if @issue
-                  scope = scope.on_issue(@issue)
-                end
-                scope
               end
               def retrieve_time_entry_query
                 retrieve_query(TimeEntryQuery, false)
               end
             end

app/helpers/issues_helper.rb +4 -2

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2016  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.
             module IssuesHelper
               include ApplicationHelper
               include Redmine::Export::PDF::IssuesPdfHelper
               def issue_list(issues, &block)
                 ancestors = []
                 issues.each do |issue|
                   while (ancestors.any? && !issue.is_descendant_of?(ancestors.last))
                     ancestors.pop
                   end
                   yield issue, ancestors.size
                   ancestors << issue unless issue.leaf?
                 end
               end
               def grouped_issue_list(issues, query, issue_count_by_group, &block)
                 previous_group, first = false, true
                 totals_by_group = query.totalable_columns.inject({}) do |h, column|
                   h[column] = query.total_by_group_for(column)
                   h
                 end
                 issue_list(issues) do |issue, level|
                   group_name = group_count = nil
                   if query.grouped?
                     group = query.group_by_column.value(issue)
                     if first || group != previous_group
                       if group.blank? && group != false
                         group_name = "(#{l(:label_blank_value)})"
                       else
                         group_name = format_object(group)
                       end
                       group_name ||= ""
                       group_count = issue_count_by_group[group]
                       group_totals = totals_by_group.map {|column, t| total_tag(column, t[group] || 0)}.join(" ").html_safe
                     end
                   end
                   yield issue, level, group_name, group_count, group_totals
                   previous_group, first = group, false
                 end
               end
               # Renders a HTML/CSS tooltip
               #
               # To use, a trigger div is needed.  This is a div with the class of "tooltip"
               # that contains this method wrapped in a span with the class of "tip"
               #
               #    <div class="tooltip"><%= link_to_issue(issue) %>
               #      <span class="tip"><%= render_issue_tooltip(issue) %></span>
               #    </div>
               #
               def render_issue_tooltip(issue)
                 @cached_label_status ||= l(:field_status)
                 @cached_label_start_date ||= l(:field_start_date)
                 @cached_label_due_date ||= l(:field_due_date)
                 @cached_label_assigned_to ||= l(:field_assigned_to)
                 @cached_label_priority ||= l(:field_priority)
                 @cached_label_project ||= l(:field_project)
                 link_to_issue(issue) + "<br /><br />".html_safe +
                   "<strong>#{@cached_label_project}</strong>: #{link_to_project(issue.project)}<br />".html_safe +
                   "<strong>#{@cached_label_status}</strong>: #{h(issue.status.name)}<br />".html_safe +
                   "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />".html_safe +
                   "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />".html_safe +
                   "<strong>#{@cached_label_assigned_to}</strong>: #{h(issue.assigned_to)}<br />".html_safe +
                   "<strong>#{@cached_label_priority}</strong>: #{h(issue.priority.name)}".html_safe
               end
               def issue_heading(issue)
                 h("#{issue.tracker} ##{issue.id}")
               end
               def render_issue_subject_with_tree(issue)
                 s = ''
                 ancestors = issue.root? ? [] : issue.ancestors.visible.to_a
                 ancestors.each do |ancestor|
                   s << '<div>' + content_tag('p', link_to_issue(ancestor, :project => (issue.project_id != ancestor.project_id)))
                 end
                 s << '<div>'
                 subject = h(issue.subject)
                 if issue.is_private?
                   subject = content_tag('span', l(:field_is_private), :class => 'private') + ' ' + subject
                 end
                 s << content_tag('h3', subject)
                 s << '</div>' * (ancestors.size + 1)
                 s.html_safe
               end
               def render_descendants_tree(issue)
                 s = '<form><table class="list issues">'
                 issue_list(issue.descendants.visible.preload(:status, :priority, :tracker, :assigned_to).sort_by(&:lft)) do |child, level|
                   css = "issue issue-#{child.id} hascontextmenu #{issue.css_classes}"
                   css << " idnt idnt-#{level}" if level > 0
                   s << content_tag('tr',
                          content_tag('td', check_box_tag("ids[]", child.id, false, :id => nil), :class => 'checkbox') +
                          content_tag('td', link_to_issue(child, :project => (issue.project_id != child.project_id)), :class => 'subject', :style => 'width: 50%') +
                          content_tag('td', h(child.status), :class => 'status') +
                          content_tag('td', link_to_user(child.assigned_to), :class => 'assigned_to') +
                          content_tag('td', child.disabled_core_fields.include?('done_ratio') ? '' : progress_bar(child.done_ratio), :class=> 'done_ratio'),
                          :class => css)
                 end
                 s << '</table></form>'
                 s.html_safe
               end
               def issue_estimated_hours_details(issue)
                 if issue.total_estimated_hours.present?
                   if issue.total_estimated_hours == issue.estimated_hours
                     l_hours_short(issue.estimated_hours)
                   else
                     s = issue.estimated_hours.present? ? l_hours_short(issue.estimated_hours) : ""
                     s << " (#{l(:label_total)}: #{l_hours_short(issue.total_estimated_hours)})"
                     s.html_safe
                   end
                 end
               end
               def issue_spent_hours_details(issue)
                 if issue.total_spent_hours > 0
+                  path = project_time_entries_path(issue.project, :issue_id => "~#{issue.id}")
                   if issue.total_spent_hours == issue.spent_hours
-                    link_to(l_hours_short(issue.spent_hours), issue_time_entries_path(issue))
+                    link_to(l_hours_short(issue.spent_hours), path)
                   else
                     s = issue.spent_hours > 0 ? l_hours_short(issue.spent_hours) : ""
-                    s << " (#{l(:label_total)}: #{link_to l_hours_short(issue.total_spent_hours), issue_time_entries_path(issue)})"
+                    s << " (#{l(:label_total)}: #{link_to l_hours_short(issue.total_spent_hours), path})"
                     s.html_safe
                   end
                 end
               end
               # Returns an array of error messages for bulk edited issues
               def bulk_edit_error_messages(issues)
                 messages = {}
                 issues.each do |issue|
                   issue.errors.full_messages.each do |message|
                     messages[message] ||= []
                     messages[message] << issue
                   end
                 end
                 messages.map { |message, issues|
                   "#{message}: " + issues.map {|i| "##{i.id}"}.join(', ')
                 }
              end
               # Returns a link for adding a new subtask to the given issue
               def link_to_new_subtask(issue)
                 attrs = {
                   :parent_issue_id => issue
                 }
                 attrs[:tracker_id] = issue.tracker unless issue.tracker.disabled_core_fields.include?('parent_issue_id')
                 link_to(l(:button_add), new_project_issue_path(issue.project, :issue => attrs))
               end
               def trackers_options_for_select(issue)
                 trackers = issue.allowed_target_trackers
                 if issue.new_record? && issue.parent_issue_id.present?
                   trackers = trackers.reject do |tracker|
                     issue.tracker_id != tracker.id && tracker.disabled_core_fields.include?('parent_issue_id')
                   end
                 end
                 trackers.collect {|t| [t.name, t.id]}
               end
               class IssueFieldsRows
                 include ActionView::Helpers::TagHelper
                 def initialize
                   @left = []
                   @right = []
                 end
                 def left(*args)
                   args.any? ? @left << cells(*args) : @left
                 end
                 def right(*args)
                   args.any? ? @right << cells(*args) : @right
                 end
                 def size
                   @left.size > @right.size ? @left.size : @right.size
                 end
                 def to_html
                   content =
                     content_tag('div', @left.reduce(&:+), :class => 'splitcontentleft') +
                     content_tag('div', @right.reduce(&:+), :class => 'splitcontentleft')
                   content_tag('div', content, :class => 'splitcontent')
                 end
                 def cells(label, text, options={})
                   options[:class] = [options[:class] || "", 'attribute'].join(' ')
                   content_tag 'div',
                     content_tag('div', label + ":", :class => 'label') + content_tag('div', text, :class => 'value'),
                     options
                 end
               end
               def issue_fields_rows
                 r = IssueFieldsRows.new
                 yield r
                 r.to_html
               end
               def render_custom_fields_rows(issue)
                 values = issue.visible_custom_field_values
                 return if values.empty?
                 half = (values.size / 2.0).ceil
                 issue_fields_rows do |rows|
                   values.each_with_index do |value, i|
                     css = "cf_#{value.custom_field.id}"
                     m = (i < half ? :left : :right)
                     rows.send m, custom_field_name_tag(value.custom_field), show_value(value), :class => css
                   end
                 end
               end
               # Returns the path for updating the issue form
               # with project as the current project
               def update_issue_form_path(project, issue)
                 options = {:format => 'js'}
                 if issue.new_record?
                   if project
                     new_project_issue_path(project, options)
                   else
                     new_issue_path(options)
                   end
                 else
                   edit_issue_path(issue, options)
                 end
               end
               # Returns the number of descendants for an array of issues
               def issues_descendant_count(issues)
                 ids = issues.reject(&:leaf?).map {|issue| issue.descendants.ids}.flatten.uniq
                 ids -= issues.map(&:id)
                 ids.size
               end
               def issues_destroy_confirmation_message(issues)
                 issues = [issues] unless issues.is_a?(Array)
                 message = l(:text_issues_destroy_confirmation)
                 descendant_count = issues_descendant_count(issues)
                 if descendant_count > 0
                   message << "\n" + l(:text_issues_destroy_descendants_confirmation, :count => descendant_count)
                 end
                 message
               end
               # Returns an array of users that are proposed as watchers
               # on the new issue form
               def users_for_new_issue_watchers(issue)
                 users = issue.watcher_users
                 if issue.project.users.count <= 20
                   users = (users + issue.project.users.sort).uniq
                 end
                 users
               end
               def email_issue_attributes(issue, user)
                 items = []
                 %w(author status priority assigned_to category fixed_version).each do |attribute|
                   unless issue.disabled_core_fields.include?(attribute+"_id")
                     items << "#{l("field_#{attribute}")}: #{issue.send attribute}"
                   end
                 end
                 issue.visible_custom_field_values(user).each do |value|
                   items << "#{value.custom_field.name}: #{show_value(value, false)}"
                 end
                 items
               end
               def render_email_issue_attributes(issue, user, html=false)
                 items = email_issue_attributes(issue, user)
                 if html
                   content_tag('ul', items.map{|s| content_tag('li', s)}.join("\n").html_safe)
                 else
                   items.map{|s| "* #{s}"}.join("\n")
                 end
               end
               # Returns the textual representation of a journal details
               # as an array of strings
               def details_to_strings(details, no_html=false, options={})
                 options[:only_path] = (options[:only_path] == false ? false : true)
                 strings = []
                 values_by_field = {}
                 details.each do |detail|
                   if detail.property == 'cf'
                     field = detail.custom_field
                     if field && field.multiple?
                       values_by_field[field] ||= {:added => [], :deleted => []}
                       if detail.old_value
                         values_by_field[field][:deleted] << detail.old_value
                       end
                       if detail.value
                         values_by_field[field][:added] << detail.value
                       end
                       next
                     end
                   end
                   strings << show_detail(detail, no_html, options)
                 end
                 if values_by_field.present?
                   multiple_values_detail = Struct.new(:property, :prop_key, :custom_field, :old_value, :value)
                   values_by_field.each do |field, changes|
                     if changes[:added].any?
                       detail = multiple_values_detail.new('cf', field.id.to_s, field)
                       detail.value = changes[:added]
                       strings << show_detail(detail, no_html, options)
                     end
                     if changes[:deleted].any?
                       detail = multiple_values_detail.new('cf', field.id.to_s, field)
                       detail.old_value = changes[:deleted]
                       strings << show_detail(detail, no_html, options)
                     end
                   end
                 end
                 strings
               end
               # Returns the textual representation of a single journal detail
               def show_detail(detail, no_html=false, options={})
                 multiple = false
                 show_diff = false
                 case detail.property
                 when 'attr'
                   field = detail.prop_key.to_s.gsub(/\_id$/, "")
                   label = l(("field_" + field).to_sym)
                   case detail.prop_key
                   when 'due_date', 'start_date'
                     value = format_date(detail.value.to_date) if detail.value
                     old_value = format_date(detail.old_value.to_date) if detail.old_value
                   when 'project_id', 'status_id', 'tracker_id', 'assigned_to_id',
                         'priority_id', 'category_id', 'fixed_version_id'
                     value = find_name_by_reflection(field, detail.value)
                     old_value = find_name_by_reflection(field, detail.old_value)
                   when 'estimated_hours'
                     value = l_hours_short(detail.value.to_f) unless detail.value.blank?
                     old_value = l_hours_short(detail.old_value.to_f) unless detail.old_value.blank?
                   when 'parent_id'
                     label = l(:field_parent_issue)
                     value = "##{detail.value}" unless detail.value.blank?
                     old_value = "##{detail.old_value}" unless detail.old_value.blank?
                   when 'is_private'
                     value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank?
                     old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank?
                   when 'description'
                     show_diff = true
                   end
                 when 'cf'
                   custom_field = detail.custom_field
                   if custom_field
                     label = custom_field.name
                     if custom_field.format.class.change_as_diff
                       show_diff = true
                     else
                       multiple = custom_field.multiple?
                       value = format_value(detail.value, custom_field) if detail.value
                       old_value = format_value(detail.old_value, custom_field) if detail.old_value
                     end
                   end
                 when 'attachment'
                   label = l(:label_attachment)
                 when 'relation'
                   if detail.value && !detail.old_value
                     rel_issue = Issue.visible.find_by_id(detail.value)
                     value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.value}" :
                               (no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path]))
                   elsif detail.old_value && !detail.value
                     rel_issue = Issue.visible.find_by_id(detail.old_value)
                     old_value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.old_value}" :
                                       (no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path]))
                   end
                   relation_type = IssueRelation::TYPES[detail.prop_key]
                   label = l(relation_type[:name]) if relation_type
                 end
                 call_hook(:helper_issues_show_detail_after_setting,
                           {:detail => detail, :label => label, :value => value, :old_value => old_value })
                 label ||= detail.prop_key
                 value ||= detail.value
                 old_value ||= detail.old_value
                 unless no_html
                   label = content_tag('strong', label)
                   old_value = content_tag("i", h(old_value)) if detail.old_value
                   if detail.old_value && detail.value.blank? && detail.property != 'relation'
                     old_value = content_tag("del", old_value)
                   end
                   if detail.property == 'attachment' && value.present? &&
                       atta = detail.journal.journalized.attachments.detect {|a| a.id == detail.prop_key.to_i}
                     # Link to the attachment if it has not been removed
                     value = link_to_attachment(atta, :download => true, :only_path => options[:only_path])
                     if options[:only_path] != false && (atta.is_text? || atta.is_image?)
                       value += ' '
                       value += link_to(l(:button_view),
                                        { :controller => 'attachments', :action => 'show',
                                          :id => atta, :filename => atta.filename },
                                        :class => 'icon-only icon-magnifier',
                                        :title => l(:button_view))
                     end
                   else
                     value = content_tag("i", h(value)) if value
                   end
                 end
                 if show_diff
                   s = l(:text_journal_changed_no_detail, :label => label)
                   unless no_html
                     diff_link = link_to 'diff',
                       diff_journal_url(detail.journal_id, :detail_id => detail.id, :only_path => options[:only_path]),
                       :title => l(:label_view_diff)
                     s << " (#{ diff_link })"
                   end
                   s.html_safe
                 elsif detail.value.present?
                   case detail.property
                   when 'attr', 'cf'
                     if detail.old_value.present?
                       l(:text_journal_changed, :label => label, :old => old_value, :new => value).html_safe
                     elsif multiple
                       l(:text_journal_added, :label => label, :value => value).html_safe
                     else
                       l(:text_journal_set_to, :label => label, :value => value).html_safe
                     end
                   when 'attachment', 'relation'
                     l(:text_journal_added, :label => label, :value => value).html_safe
                   end
                 else
                   l(:text_journal_deleted, :label => label, :old => old_value).html_safe
                 end
               end
               # Find the name of an associated record stored in the field attribute
               def find_name_by_reflection(field, id)
                 unless id.present?
                   return nil
                 end
                 @detail_value_name_by_reflection ||= Hash.new do |hash, key|
                   association = Issue.reflect_on_association(key.first.to_sym)
                   name = nil
                   if association
                     record = association.klass.find_by_id(key.last)
                     if record
                       name = record.name.force_encoding('UTF-8')
                     end
                   end
                   hash[key] = name
                 end
                 @detail_value_name_by_reflection[[field, id]]
               end
               # Renders issue children recursively
               def render_api_issue_children(issue, api)
                 return if issue.leaf?
                 api.array :children do
                   issue.children.each do |child|
                     api.issue(:id => child.id) do
                       api.tracker(:id => child.tracker_id, :name => child.tracker.name) unless child.tracker.nil?
                       api.subject child.subject
                       render_api_issue_children(child, api)
                     end
                   end
                 end
               end
             end

app/helpers/queries_helper.rb +3 -1

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2016  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.
             module QueriesHelper
               include ApplicationHelper
               def filters_options_for_select(query)
                 ungrouped = []
                 grouped = {}
                 query.available_filters.map do |field, field_options|
-                  if [:tree, :relation].include?(field_options[:type])
+                  if field_options[:type] == :relation
                     group = :label_relations
+                  elsif field_options[:type] == :tree
+                    group = query.is_a?(IssueQuery) ? :label_relations : nil
                   elsif field =~ /^(.+)\./
                     # association filters
                     group = "field_#{$1}"
                   elsif %w(member_of_group assigned_to_role).include?(field)
                     group = :field_assigned_to
                   elsif field_options[:type] == :date_past || field_options[:type] == :date
                     group = :label_date
                   end
                   if group
                     (grouped[group] ||= []) << [field_options[:name], field]
                   else
                     ungrouped << [field_options[:name], field]
                   end
                 end
                 # Don't group dates if there's only one (eg. time entries filters)
                 if grouped[:label_date].try(:size) == 1
                   ungrouped << grouped.delete(:label_date).first
                 end
                 s = options_for_select([[]] + ungrouped)
                 if grouped.present?
                   localized_grouped = grouped.map {|k,v| [l(k), v]}
                   s << grouped_options_for_select(localized_grouped)
                 end
                 s
               end
               def query_filters_hidden_tags(query)
                 tags = ''.html_safe
                 query.filters.each do |field, options|
                   tags << hidden_field_tag("f[]", field, :id => nil)
                   tags << hidden_field_tag("op[#{field}]", options[:operator], :id => nil)
                   options[:values].each do |value|
                     tags << hidden_field_tag("v[#{field}][]", value, :id => nil)
                   end
                 end
                 tags
               end
               def query_columns_hidden_tags(query)
                 tags = ''.html_safe
                 query.columns.each do |column|
                   tags << hidden_field_tag("c[]", column.name, :id => nil)
                 end
                 tags
               end
               def query_hidden_tags(query)
                 query_filters_hidden_tags(query) + query_columns_hidden_tags(query)
               end
               def available_block_columns_tags(query)
                 tags = ''.html_safe
                 query.available_block_columns.each do |column|
                   tags << content_tag('label', check_box_tag('c[]', column.name.to_s, query.has_column?(column), :id => nil) + " #{column.caption}", :class => 'inline')
                 end
                 tags
               end
               def available_totalable_columns_tags(query)
                 tags = ''.html_safe
                 query.available_totalable_columns.each do |column|
                   tags << content_tag('label', check_box_tag('t[]', column.name.to_s, query.totalable_columns.include?(column), :id => nil) + " #{column.caption}", :class => 'inline')
                 end
                 tags << hidden_field_tag('t[]', '')
                 tags
               end
               def query_available_inline_columns_options(query)
                 (query.available_inline_columns - query.columns).reject(&:frozen?).collect {|column| [column.caption, column.name]}
               end
               def query_selected_inline_columns_options(query)
                 (query.inline_columns & query.available_inline_columns).reject(&:frozen?).collect {|column| [column.caption, column.name]}
               end
               def render_query_columns_selection(query, options={})
                 tag_name = (options[:name] || 'c') + '[]'
                 render :partial => 'queries/columns', :locals => {:query => query, :tag_name => tag_name}
               end
               def render_query_totals(query)
                 return unless query.totalable_columns.present?
                 totals = query.totalable_columns.map do |column|
                   total_tag(column, query.total_for(column))
                 end
                 content_tag('p', totals.join(" ").html_safe, :class => "query-totals")
               end
               def total_tag(column, value)
                 label = content_tag('span', "#{column.caption}:")
                 value = content_tag('span', format_object(value), :class => 'value')
                 content_tag('span', label + " " + value, :class => "total-for-#{column.name.to_s.dasherize}")
               end
               def column_header(column)
                 column.sortable ? sort_header_tag(column.name.to_s, :caption => column.caption,
                                                                     :default_order => column.default_order) :
                                   content_tag('th', h(column.caption))
               end
               def column_content(column, issue)
                 value = column.value_object(issue)
                 if value.is_a?(Array)
                   value.collect {|v| column_value(column, issue, v)}.compact.join(', ').html_safe
                 else
                   column_value(column, issue, value)
                 end
               end
               def column_value(column, issue, value)
                 case column.name
                 when :id
                   link_to value, issue_path(issue)
                 when :subject
                   link_to value, issue_path(issue)
                 when :parent
                   value ? (value.visible? ? link_to_issue(value, :subject => false) : "##{value.id}") : ''
                 when :description
                   issue.description? ? content_tag('div', textilizable(issue, :description), :class => "wiki") : ''
                 when :done_ratio
                   progress_bar(value)
                 when :relations
                   content_tag('span',
                     value.to_s(issue) {|other| link_to_issue(other, :subject => false, :tracker => false)}.html_safe,
                     :class => value.css_classes_for(issue))
                 else
                   format_object(value)
                 end
               end
               def csv_content(column, issue)
                 value = column.value_object(issue)
                 if value.is_a?(Array)
                   value.collect {|v| csv_value(column, issue, v)}.compact.join(', ')
                 else
                   csv_value(column, issue, value)
                 end
               end
               def csv_value(column, object, value)
                 format_object(value, false) do |value|
                   case value.class.name
                   when 'Float'
                     sprintf("%.2f", value).gsub('.', l(:general_csv_decimal_separator))
                   when 'IssueRelation'
                     value.to_s(object)
                   when 'Issue'
                     if object.is_a?(TimeEntry)
                       "#{value.tracker} ##{value.id}: #{value.subject}"
                     else
                       value.id
                     end
                   else
                     value
                   end
                 end
               end
               def query_to_csv(items, query, options={})
                 options ||= {}
                 columns = (options[:columns] == 'all' ? query.available_inline_columns : query.inline_columns)
                 query.available_block_columns.each do |column|
                   if options[column.name].present?
                     columns << column
                   end
                 end
                 Redmine::Export::CSV.generate do |csv|
                   # csv header fields
                   csv << columns.map {|c| c.caption.to_s}
                   # csv lines
                   items.each do |item|
                     csv << columns.map {|c| csv_content(c, item)}
                   end
                 end
               end
               # Retrieve query from session or build a new query
               def retrieve_query(klass=IssueQuery, use_session=true)
                 session_key = klass.name.underscore.to_sym
                 if params[:query_id].present?
                   cond = "project_id IS NULL"
                   cond << " OR project_id = #{@project.id}" if @project
                   @query = klass.where(cond).find(params[:query_id])
                   raise ::Unauthorized unless @query.visible?
                   @query.project = @project
                   session[session_key] = {:id => @query.id, :project_id => @query.project_id} if use_session
                   sort_clear
                 elsif api_request? || params[:set_filter] || !use_session || session[session_key].nil? || session[session_key][:project_id] != (@project ? @project.id : nil)
                   # Give it a name, required to be valid
                   @query = klass.new(:name => "_", :project => @project)
                   @query.build_from_params(params)
                   session[session_key] = {:project_id => @query.project_id, :filters => @query.filters, :group_by => @query.group_by, :column_names => @query.column_names, :totalable_names => @query.totalable_names} if use_session
                 else
                   # retrieve from session
                   @query = nil
                   @query = klass.find_by_id(session[session_key][:id]) if session[session_key][:id]
                   @query ||= klass.new(:name => "_", :filters => session[session_key][:filters], :group_by => session[session_key][:group_by], :column_names => session[session_key][:column_names], :totalable_names => session[session_key][:totalable_names])
                   @query.project = @project
                 end
               end
               def retrieve_query_from_session
                 if session[:query]
                   if session[:query][:id]
                     @query = IssueQuery.find_by_id(session[:query][:id])
                     return unless @query
                   else
                     @query = IssueQuery.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names], :totalable_names => session[:query][:totalable_names])
                   end
                   if session[:query].has_key?(:project_id)
                     @query.project_id = session[:query][:project_id]
                   else
                     @query.project = @project
                   end
                   @query
                 end
               end
               # Returns the query definition as hidden field tags
               def query_as_hidden_field_tags(query)
                 tags = hidden_field_tag("set_filter", "1", :id => nil)
                 if query.filters.present?
                   query.filters.each do |field, filter|
                     tags << hidden_field_tag("f[]", field, :id => nil)
                     tags << hidden_field_tag("op[#{field}]", filter[:operator], :id => nil)
                     filter[:values].each do |value|
                       tags << hidden_field_tag("v[#{field}][]", value, :id => nil)
                     end
                   end
                 else
                   tags << hidden_field_tag("f[]", "", :id => nil)
                 end
                 if query.column_names.present?
                   query.column_names.each do |name|
                     tags << hidden_field_tag("c[]", name, :id => nil)
                   end
                 end
                 if query.totalable_names.present?
                   query.totalable_names.each do |name|
                     tags << hidden_field_tag("t[]", name, :id => nil)
                   end
                 end
                 if query.group_by.present?
                   tags << hidden_field_tag("group_by", query.group_by, :id => nil)
                 end
                 tags
               end
               # Returns the queries that are rendered in the sidebar
               def sidebar_queries(klass, project)
                 klass.visible.global_or_on_project(@project).sorted.to_a
               end
               # Renders a group of queries
               def query_links(title, queries)
                 return '' if queries.empty?
                 # links to #index on issues/show
                 url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : {}
                 content_tag('h3', title) + "\n" +
                   content_tag('ul',
                     queries.collect {|query|
                         css = 'query'
                         css << ' selected' if query == @query
                         content_tag('li', link_to(query.name, url_params.merge(:query_id => query), :class => css))
                       }.join("\n").html_safe,
                     :class => 'queries'
                   ) + "\n"
               end
               # Renders the list of queries for the sidebar
               def render_sidebar_queries(klass, project)
                 queries = sidebar_queries(klass, project)
                 out = ''.html_safe
                 out << query_links(l(:label_my_queries), queries.select(&:is_private?))
                 out << query_links(l(:label_query_plural), queries.reject(&:is_private?))
                 out
               end
             end

app/helpers/routes_helper.rb +2 -6

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2016  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.
             module RoutesHelper
               # Returns the path to project issues or to the cross-project
               # issue list if project is nil
               def _project_issues_path(project, *args)
                 if project
                   project_issues_path(project, *args)
                 else
                   issues_path(*args)
                 end
               end
               def _project_news_path(project, *args)
                 if project
                   project_news_index_path(project, *args)
                 else
                   news_index_path(*args)
                 end
               end
               def _new_project_issue_path(project, *args)
                 if project
                   new_project_issue_path(project, *args)
                 else
                   new_issue_path(*args)
                 end
               end
               def _project_calendar_path(project, *args)
                 project ? project_calendar_path(project, *args) : issues_calendar_path(*args)
               end
               def _project_gantt_path(project, *args)
                 project ? project_gantt_path(project, *args) : issues_gantt_path(*args)
               end
               def _time_entries_path(project, issue, *args)
-                if issue
+                if project
-                  issue_time_entries_path(issue, *args)
-                elsif project
                   project_time_entries_path(project, *args)
                 else
                   time_entries_path(*args)
                 end
               end
               def _report_time_entries_path(project, issue, *args)
-                if issue
+                if project
-                  report_issue_time_entries_path(issue, *args)
-                elsif project
                   report_project_time_entries_path(project, *args)
                 else
                   report_time_entries_path(*args)
                 end
               end
               def _new_time_entry_path(project, issue, *args)
                 if issue
                   new_issue_time_entry_path(issue, *args)
                 elsif project
                   new_project_time_entry_path(project, *args)
                 else
                   new_time_entry_path(*args)
                 end
               end
               def board_path(board, *args)
                 project_board_path(board.project, board, *args)
               end
             end

app/helpers/timelog_helper.rb 0 -14

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2016  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.
             module TimelogHelper
               include ApplicationHelper
-              def render_timelog_breadcrumb
-                links = []
-                links << link_to(l(:label_project_all), {:project_id => nil, :issue_id => nil})
-                links << link_to(h(@project), {:project_id => @project, :issue_id => nil}) if @project
-                if @issue
-                  if @issue.visible?
-                    links << link_to_issue(@issue, :subject => false)
-                  else
-                    links << "##{@issue.id}"
-                  end
-                end
-                breadcrumb links
-              end
               # Returns a collection of activities for a select field.  time_entry
               # is optional and will be used to check if the selected TimeEntryActivity
               # is active.
               def activity_collection_for_select_options(time_entry=nil, project=nil)
                 project ||= time_entry.try(:project)
                 project ||= @project
                 if project.nil?
                   activities = TimeEntryActivity.shared.active
                 else
                   activities = project.activities
                 end
                 collection = []
                 if time_entry && time_entry.activity && !time_entry.activity.active?
                   collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ]
                 else
                   collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ] unless activities.detect(&:is_default)
                 end
                 activities.each { |a| collection << [a.name, a.id] }
                 collection
               end
               def select_hours(data, criteria, value)
                 if value.to_s.empty?
                   data.select {|row| row[criteria].blank? }
                 else
                   data.select {|row| row[criteria].to_s == value.to_s}
                 end
               end
               def sum_hours(data)
                 sum = 0
                 data.each do |row|
                   sum += row['hours'].to_f
                 end
                 sum
               end
               def format_criteria_value(criteria_options, value)
                 if value.blank?
                   "[#{l(:label_none)}]"
                 elsif k = criteria_options[:klass]
                   obj = k.find_by_id(value.to_i)
                   if obj.is_a?(Issue)
                     obj.visible? ? "#{obj.tracker} ##{obj.id}: #{obj.subject}" : "##{obj.id}"
                   else
                     obj
                   end
                 elsif cf = criteria_options[:custom_field]
                   format_value(value, cf)
                 else
                   value.to_s
                 end
               end
               def report_to_csv(report)
                 Redmine::Export::CSV.generate do |csv|
                   # Column headers
                   headers = report.criteria.collect {|criteria| l(report.available_criteria[criteria][:label]) }
                   headers += report.periods
                   headers << l(:label_total_time)
                   csv << headers
                   # Content
                   report_criteria_to_csv(csv, report.available_criteria, report.columns, report.criteria, report.periods, report.hours)
                   # Total row
                   str_total = l(:label_total_time)
                   row = [ str_total ] + [''] * (report.criteria.size - 1)
                   total = 0
                   report.periods.each do |period|
                     sum = sum_hours(select_hours(report.hours, report.columns, period.to_s))
                     total += sum
                     row << (sum > 0 ? sum : '')
                   end
                   row << total
                   csv << row
                 end
               end
               def report_criteria_to_csv(csv, available_criteria, columns, criteria, periods, hours, level=0)
                 hours.collect {|h| h[criteria[level]].to_s}.uniq.each do |value|
                   hours_for_value = select_hours(hours, criteria[level], value)
                   next if hours_for_value.empty?
                   row = [''] * level
                   row << format_criteria_value(available_criteria[criteria[level]], value).to_s
                   row += [''] * (criteria.length - level - 1)
                   total = 0
                   periods.each do |period|
                     sum = sum_hours(select_hours(hours_for_value, columns, period.to_s))
                     total += sum
                     row << (sum > 0 ? sum : '')
                   end
                   row << total
                   csv << row
                   if criteria.length > level + 1
                     report_criteria_to_csv(csv, available_criteria, columns, criteria, periods, hours_for_value, level + 1)
                   end
                 end
               end
             end

app/models/query.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class QueryColumn
               attr_accessor :name, :sortable, :groupable, :totalable, :default_order
               include Redmine::I18n
               def initialize(name, options={})
                 self.name = name
                 self.sortable = options[:sortable]
                 self.groupable = options[:groupable] || false
                 if groupable == true
                   self.groupable = name.to_s
                 end
                 self.totalable = options[:totalable] || false
                 self.default_order = options[:default_order]
                 @inline = options.key?(:inline) ? options[:inline] : true
                 @caption_key = options[:caption] || "field_#{name}".to_sym
                 @frozen = options[:frozen]
               end
               def caption
                 case @caption_key
                 when Symbol
                   l(@caption_key)
                 when Proc
                   @caption_key.call
                 else
                   @caption_key
                 end
               end
               # Returns true if the column is sortable, otherwise false
               def sortable?
                 !@sortable.nil?
               end
               def sortable
                 @sortable.is_a?(Proc) ? @sortable.call : @sortable
               end
               def inline?
                 @inline
               end
               def frozen?
                 @frozen
               end
               def value(object)
                 object.send name
               end
               def value_object(object)
                 object.send name
               end
               def css_classes
                 name
               end
             end
             class QueryCustomFieldColumn < QueryColumn
               def initialize(custom_field)
                 self.name = "cf_#{custom_field.id}".to_sym
                 self.sortable = custom_field.order_statement || false
                 self.groupable = custom_field.group_statement || false
                 self.totalable = custom_field.totalable?
                 @inline = true
                 @cf = custom_field
               end
               def caption
                 @cf.name
               end
               def custom_field
                 @cf
               end
               def value_object(object)
                 if custom_field.visible_by?(object.project, User.current)
                   cv = object.custom_values.select {|v| v.custom_field_id == @cf.id}
                   cv.size > 1 ? cv.sort {|a,b| a.value.to_s <=> b.value.to_s} : cv.first
                 else
                   nil
                 end
               end
               def value(object)
                 raw = value_object(object)
                 if raw.is_a?(Array)
                   raw.map {|r| @cf.cast_value(r.value)}
                 elsif raw
                   @cf.cast_value(raw.value)
                 else
                   nil
                 end
               end
               def css_classes
                 @css_classes ||= "#{name} #{@cf.field_format}"
               end
             end
             class QueryAssociationCustomFieldColumn < QueryCustomFieldColumn
               def initialize(association, custom_field)
                 super(custom_field)
                 self.name = "#{association}.cf_#{custom_field.id}".to_sym
                 # TODO: support sorting/grouping by association custom field
                 self.sortable = false
                 self.groupable = false
                 @association = association
               end
               def value_object(object)
                 if assoc = object.send(@association)
                   super(assoc)
                 end
               end
               def css_classes
                 @css_classes ||= "#{@association}_cf_#{@cf.id} #{@cf.field_format}"
               end
             end
             class Query < ActiveRecord::Base
               class StatementInvalid < ::ActiveRecord::StatementInvalid
               end
               include Redmine::SubclassFactory
               VISIBILITY_PRIVATE = 0
               VISIBILITY_ROLES   = 1
               VISIBILITY_PUBLIC  = 2
               belongs_to :project
               belongs_to :user
               has_and_belongs_to_many :roles, :join_table => "#{table_name_prefix}queries_roles#{table_name_suffix}", :foreign_key => "query_id"
               serialize :filters
               serialize :column_names
               serialize :sort_criteria, Array
               serialize :options, Hash
               attr_protected :project_id, :user_id
               validates_presence_of :name
               validates_length_of :name, :maximum => 255
               validates :visibility, :inclusion => { :in => [VISIBILITY_PUBLIC, VISIBILITY_ROLES, VISIBILITY_PRIVATE] }
               validate :validate_query_filters
               validate do |query|
                 errors.add(:base, l(:label_role_plural) + ' ' + l('activerecord.errors.messages.blank')) if query.visibility == VISIBILITY_ROLES && roles.blank?
               end
               after_save do |query|
                 if query.visibility_changed? && query.visibility != VISIBILITY_ROLES
                   query.roles.clear
                 end
               end
               class_attribute :operators
               self.operators = {
                 "="   => :label_equals,
                 "!"   => :label_not_equals,
                 "o"   => :label_open_issues,
                 "c"   => :label_closed_issues,
                 "!*"  => :label_none,
                 "*"   => :label_any,
                 ">="  => :label_greater_or_equal,
                 "<="  => :label_less_or_equal,
                 "><"  => :label_between,
                 "<t+" => :label_in_less_than,
                 ">t+" => :label_in_more_than,
                 "><t+"=> :label_in_the_next_days,
                 "t+"  => :label_in,
                 "t"   => :label_today,
                 "ld"  => :label_yesterday,
                 "w"   => :label_this_week,
                 "lw"  => :label_last_week,
                 "l2w" => [:label_last_n_weeks, {:count => 2}],
                 "m"   => :label_this_month,
                 "lm"  => :label_last_month,
                 "y"   => :label_this_year,
                 ">t-" => :label_less_than_ago,
                 "<t-" => :label_more_than_ago,
                 "><t-"=> :label_in_the_past_days,
                 "t-"  => :label_ago,
                 "~"   => :label_contains,
                 "!~"  => :label_not_contains,
                 "=p"  => :label_any_issues_in_project,
                 "=!p" => :label_any_issues_not_in_project,
                 "!p"  => :label_no_issues_in_project,
                 "*o"  => :label_any_open_issues,
                 "!o"  => :label_no_open_issues
               }
               class_attribute :operators_by_filter_type
               self.operators_by_filter_type = {
                 :list => [ "=", "!" ],
                 :list_status => [ "o", "=", "!", "c", "*" ],
                 :list_optional => [ "=", "!", "!*", "*" ],
                 :list_subprojects => [ "*", "!*", "=" ],
                 :date => [ "=", ">=", "<=", "><", "<t+", ">t+", "><t+", "t+", "t", "ld", "w", "lw", "l2w", "m", "lm", "y", ">t-", "<t-", "><t-", "t-", "!*", "*" ],
                 :date_past => [ "=", ">=", "<=", "><", ">t-", "<t-", "><t-", "t-", "t", "ld", "w", "lw", "l2w", "m", "lm", "y", "!*", "*" ],
                 :string => [ "=", "~", "!", "!~", "!*", "*" ],
                 :text => [  "~", "!~", "!*", "*" ],
                 :integer => [ "=", ">=", "<=", "><", "!*", "*" ],
                 :float => [ "=", ">=", "<=", "><", "!*", "*" ],
                 :relation => ["=", "=p", "=!p", "!p", "*o", "!o", "!*", "*"],
                 :tree => ["=", "~", "!*", "*"]
               }
               class_attribute :available_columns
               self.available_columns = []
               class_attribute :queried_class
               # Permission required to view the queries, set on subclasses.
               class_attribute :view_permission
               # Scope of queries that are global or on the given project
               scope :global_or_on_project, lambda {|project|
                 where(:project_id => (project.nil? ? nil : [nil, project.id]))
               }
               scope :sorted, lambda {order(:name, :id)}
               # Scope of visible queries, can be used from subclasses only.
               # Unlike other visible scopes, a class methods is used as it
               # let handle inheritance more nicely than scope DSL.
               def self.visible(*args)
                 if self == ::Query
                   # Visibility depends on permissions for each subclass,
                   # raise an error if the scope is called from Query (eg. Query.visible)
                   raise Exception.new("Cannot call .visible scope from the base Query class, but from subclasses only.")
                 end
                 user = args.shift || User.current
                 base = Project.allowed_to_condition(user, view_permission, *args)
                 scope = joins("LEFT OUTER JOIN #{Project.table_name} ON #{table_name}.project_id = #{Project.table_name}.id").
                   where("#{table_name}.project_id IS NULL OR (#{base})")
                 if user.admin?
                   scope.where("#{table_name}.visibility <> ? OR #{table_name}.user_id = ?", VISIBILITY_PRIVATE, user.id)
                 elsif user.memberships.any?
                   scope.where("#{table_name}.visibility = ?" +
                     " OR (#{table_name}.visibility = ? AND #{table_name}.id IN (" +
                       "SELECT DISTINCT q.id FROM #{table_name} q" +
                       " INNER JOIN #{table_name_prefix}queries_roles#{table_name_suffix} qr on qr.query_id = q.id" +
                       " INNER JOIN #{MemberRole.table_name} mr ON mr.role_id = qr.role_id" +
                       " INNER JOIN #{Member.table_name} m ON m.id = mr.member_id AND m.user_id = ?" +
                       " WHERE q.project_id IS NULL OR q.project_id = m.project_id))" +
                     " OR #{table_name}.user_id = ?",
                     VISIBILITY_PUBLIC, VISIBILITY_ROLES, user.id, user.id)
                 elsif user.logged?
                   scope.where("#{table_name}.visibility = ? OR #{table_name}.user_id = ?", VISIBILITY_PUBLIC, user.id)
                 else
                   scope.where("#{table_name}.visibility = ?", VISIBILITY_PUBLIC)
                 end
               end
               # Returns true if the query is visible to +user+ or the current user.
               def visible?(user=User.current)
                 return true if user.admin?
                 return false unless project.nil? || user.allowed_to?(self.class.view_permission, project)
                 case visibility
                 when VISIBILITY_PUBLIC
                   true
                 when VISIBILITY_ROLES
                   if project
                     (user.roles_for_project(project) & roles).any?
                   else
                     Member.where(:user_id => user.id).joins(:roles).where(:member_roles => {:role_id => roles.map(&:id)}).any?
                   end
                 else
                   user == self.user
                 end
               end
               def is_private?
                 visibility == VISIBILITY_PRIVATE
               end
               def is_public?
                 !is_private?
               end
               def queried_table_name
                 @queried_table_name ||= self.class.queried_class.table_name
               end
               def initialize(attributes=nil, *args)
                 super attributes
                 @is_for_all = project.nil?
               end
               # Builds the query from the given params
               def build_from_params(params)
                 if params[:fields] || params[:f]
                   self.filters = {}
                   add_filters(params[:fields] || params[:f], params[:operators] || params[:op], params[:values] || params[:v])
                 else
                   available_filters.keys.each do |field|
                     add_short_filter(field, params[field]) if params[field]
                   end
                 end
                 self.group_by = params[:group_by] || (params[:query] && params[:query][:group_by])
                 self.column_names = params[:c] || (params[:query] && params[:query][:column_names])
                 self.totalable_names = params[:t] || (params[:query] && params[:query][:totalable_names])
                 self
               end
               # Builds a new query from the given params and attributes
               def self.build_from_params(params, attributes={})
                 new(attributes).build_from_params(params)
               end
               def validate_query_filters
                 filters.each_key do |field|
                   if values_for(field)
                     case type_for(field)
                     when :integer
                       add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/\A[+-]?\d+(,[+-]?\d+)*\z/) }
                     when :float
                       add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/\A[+-]?\d+(\.\d*)?\z/) }
                     when :date, :date_past
                       case operator_for(field)
                       when "=", ">=", "<=", "><"
                         add_filter_error(field, :invalid) if values_for(field).detect {|v|
                           v.present? && (!v.match(/\A\d{4}-\d{2}-\d{2}(T\d{2}((:)?\d{2}){0,2}(Z|\d{2}:?\d{2})?)?\z/) || parse_date(v).nil?)
                         }
                       when ">t-", "<t-", "t-", ">t+", "<t+", "t+", "><t+", "><t-"
                         add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^\d+$/) }
                       end
                     end
                   end
                   add_filter_error(field, :blank) unless
                       # filter requires one or more values
                       (values_for(field) and !values_for(field).first.blank?) or
                       # filter doesn't require any value
                       ["o", "c", "!*", "*", "t", "ld", "w", "lw", "l2w", "m", "lm", "y", "*o", "!o"].include? operator_for(field)
                 end if filters
               end
               def add_filter_error(field, message)
                 m = label_for(field) + " " + l(message, :scope => 'activerecord.errors.messages')
                 errors.add(:base, m)
               end
               def editable_by?(user)
                 return false unless user
                 # Admin can edit them all and regular users can edit their private queries
                 return true if user.admin? || (is_private? && self.user_id == user.id)
                 # Members can not edit public queries that are for all project (only admin is allowed to)
                 is_public? && !@is_for_all && user.allowed_to?(:manage_public_queries, project)
               end
               def trackers
                 @trackers ||= (project.nil? ? Tracker.all : project.rolled_up_trackers).visible.sorted
               end
               # Returns a hash of localized labels for all filter operators
               def self.operators_labels
                 operators.inject({}) {|h, operator| h[operator.first] = l(*operator.last); h}
               end
               # Returns a representation of the available filters for JSON serialization
               def available_filters_as_json
                 json = {}
                 available_filters.each do |field, options|
                   options = options.slice(:type, :name, :values)
                   if options[:values] && values_for(field)
                     missing = Array(values_for(field)).select(&:present?) - options[:values].map(&:last)
                     if missing.any? && respond_to?(method = "find_#{field}_filter_values")
                       options[:values] += send(method, missing)
                     end
                   end
                   json[field] = options.stringify_keys
                 end
                 json
               end
               def all_projects
                 @all_projects ||= Project.visible.to_a
               end
               def all_projects_values
                 return @all_projects_values if @all_projects_values
                 values = []
                 Project.project_tree(all_projects) do |p, level|
                   prefix = (level > 0 ? ('--' * level + ' ') : '')
                   values << ["#{prefix}#{p.name}", p.id.to_s]
                 end
                 @all_projects_values = values
               end
               # Adds available filters
               def initialize_available_filters
                 # implemented by sub-classes
               end
               protected :initialize_available_filters
               # Adds an available filter
               def add_available_filter(field, options)
                 @available_filters ||= ActiveSupport::OrderedHash.new
                 @available_filters[field] = options
                 @available_filters
               end
               # Removes an available filter
               def delete_available_filter(field)
                 if @available_filters
                   @available_filters.delete(field)
                 end
               end
               # Return a hash of available filters
               def available_filters
                 unless @available_filters
                   initialize_available_filters
                   @available_filters.each do |field, options|
                     options[:name] ||= l(options[:label] || "field_#{field}".gsub(/_id$/, ''))
                   end
                 end
                 @available_filters
               end
               def add_filter(field, operator, values=nil)
                 # values must be an array
                 return unless values.nil? || values.is_a?(Array)
                 # check if field is defined as an available filter
                 if available_filters.has_key? field
                   filter_options = available_filters[field]
                   filters[field] = {:operator => operator, :values => (values || [''])}
                 end
               end
               def add_short_filter(field, expression)
                 return unless expression && available_filters.has_key?(field)
                 field_type = available_filters[field][:type]
                 operators_by_filter_type[field_type].sort.reverse.detect do |operator|
                   next unless expression =~ /^#{Regexp.escape(operator)}(.*)$/
                   values = $1
                   add_filter field, operator, values.present? ? values.split('|') : ['']
-                end || add_filter(field, '=', expression.split('|'))
+                end || add_filter(field, '=', expression.to_s.split('|'))
               end
               # Add multiple filters using +add_filter+
               def add_filters(fields, operators, values)
                 if fields.is_a?(Array) && operators.is_a?(Hash) && (values.nil? || values.is_a?(Hash))
                   fields.each do |field|
                     add_filter(field, operators[field], values && values[field])
                   end
                 end
               end
               def has_filter?(field)
                 filters and filters[field]
               end
               def type_for(field)
                 available_filters[field][:type] if available_filters.has_key?(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 value_for(field, index=0)
                 (values_for(field) || [])[index]
               end
               def label_for(field)
                 label = available_filters[field][:name] if available_filters.has_key?(field)
                 label ||= queried_class.human_attribute_name(field, :default => field)
               end
               def self.add_available_column(column)
                 self.available_columns << (column) if column.is_a?(QueryColumn)
               end
               # Returns an array of columns that can be used to group the results
               def groupable_columns
                 available_columns.select {|c| c.groupable}
               end
               # Returns a Hash of columns and the key for sorting
               def sortable_columns
                 available_columns.inject({}) {|h, column|
                   h[column.name.to_s] = column.sortable
                   h
                 }
               end
               def columns
                 # preserve the column_names order
                 cols = (has_default_columns? ? default_columns_names : column_names).collect do |name|
                    available_columns.find { |col| col.name == name }
                 end.compact
                 available_columns.select(&:frozen?) | cols
               end
               def inline_columns
                 columns.select(&:inline?)
               end
               def block_columns
                 columns.reject(&:inline?)
               end
               def available_inline_columns
                 available_columns.select(&:inline?)
               end
               def available_block_columns
                 available_columns.reject(&:inline?)
               end
               def available_totalable_columns
                 available_columns.select(&:totalable)
               end
               def default_columns_names
                 []
               end
               def column_names=(names)
                 if names
                   names = names.select {|n| n.is_a?(Symbol) || !n.blank? }
                   names = names.collect {|n| n.is_a?(Symbol) ? n : n.to_sym }
                   # Set column_names to nil if default columns
                   if names == default_columns_names
                     names = nil
                   end
                 end
                 write_attribute(:column_names, names)
               end
               def has_column?(column)
                 column_names && column_names.include?(column.is_a?(QueryColumn) ? column.name : column)
               end
               def has_custom_field_column?
                 columns.any? {|column| column.is_a? QueryCustomFieldColumn}
               end
               def has_default_columns?
                 column_names.nil? || column_names.empty?
               end
               def totalable_columns
                 names = totalable_names
                 available_totalable_columns.select {|column| names.include?(column.name)}
               end
               def totalable_names=(names)
                 if names
                   names = names.select(&:present?).map {|n| n.is_a?(Symbol) ? n : n.to_sym}
                 end
                 options[:totalable_names] = names
               end
               def totalable_names
                 options[:totalable_names] || Setting.issue_list_default_totals.map(&:to_sym) || []
               end
               def sort_criteria=(arg)
                 c = []
                 if arg.is_a?(Hash)
                   arg = arg.keys.sort.collect {|k| arg[k]}
                 end
                 if arg
                   c = arg.select {|k,o| !k.to_s.blank?}.slice(0,3).collect {|k,o| [k.to_s, (o == 'desc' || o == false) ? 'desc' : 'asc']}
                 end
                 write_attribute(:sort_criteria, c)
               end
               def sort_criteria
                 read_attribute(:sort_criteria) || []
               end
               def sort_criteria_key(arg)
                 sort_criteria && sort_criteria[arg] && sort_criteria[arg].first
               end
               def sort_criteria_order(arg)
                 sort_criteria && sort_criteria[arg] && sort_criteria[arg].last
               end
               def sort_criteria_order_for(key)
                 sort_criteria.detect {|k, order| key.to_s == k}.try(:last)
               end
               # Returns the SQL sort order that should be prepended for grouping
               def group_by_sort_order
                 if column = group_by_column
                   order = (sort_criteria_order_for(column.name) || column.default_order).try(:upcase)
                   Array(column.sortable).map {|s| "#{s} #{order}"}
                 end
               end
               # Returns true if the query is a grouped query
               def grouped?
                 !group_by_column.nil?
               end
               def group_by_column
                 groupable_columns.detect {|c| c.groupable && c.name.to_s == group_by}
               end
               def group_by_statement
                 group_by_column.try(:groupable)
               end
               def project_statement
                 project_clauses = []
                 if project && !project.descendants.active.empty?
                   if has_filter?("subproject_id")
                     case operator_for("subproject_id")
                     when '='
                       # include the selected subprojects
                       ids = [project.id] + values_for("subproject_id").each(&:to_i)
                       project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
                     when '!*'
                       # main project only
                       project_clauses << "#{Project.table_name}.id = %d" % project.id
                     else
                       # all subprojects
                       project_clauses << "#{Project.table_name}.lft >= #{project.lft} AND #{Project.table_name}.rgt <= #{project.rgt}"
                     end
                   elsif Setting.display_subprojects_issues?
                     project_clauses << "#{Project.table_name}.lft >= #{project.lft} AND #{Project.table_name}.rgt <= #{project.rgt}"
                   else
                     project_clauses << "#{Project.table_name}.id = %d" % project.id
                   end
                 elsif project
                   project_clauses << "#{Project.table_name}.id = %d" % project.id
                 end
                 project_clauses.any? ? project_clauses.join(' AND ') : nil
               end
               def statement
                 # filters clauses
                 filters_clauses = []
                 filters.each_key do |field|
                   next if field == "subproject_id"
                   v = values_for(field).clone
                   next unless v and !v.empty?
                   operator = operator_for(field)
                   # "me" value substitution
                   if %w(assigned_to_id author_id user_id watcher_id).include?(field)
                     if v.delete("me")
                       if User.current.logged?
                         v.push(User.current.id.to_s)
                         v += User.current.group_ids.map(&:to_s) if field == 'assigned_to_id'
                       else
                         v.push("0")
                       end
                     end
                   end
                   if field == 'project_id'
                     if v.delete('mine')
                       v += User.current.memberships.map(&:project_id).map(&:to_s)
                     end
                   end
                   if field =~ /cf_(\d+)$/
                     # custom field
                     filters_clauses << sql_for_custom_field(field, operator, v, $1)
                   elsif respond_to?("sql_for_#{field}_field")
                     # specific statement
                     filters_clauses << send("sql_for_#{field}_field", field, operator, v)
                   else
                     # regular field
                     filters_clauses << '(' + sql_for_field(field, operator, v, queried_table_name, field) + ')'
                   end
                 end if filters and valid?
                 if (c = group_by_column) && c.is_a?(QueryCustomFieldColumn)
                   # Excludes results for which the grouped custom field is not visible
                   filters_clauses << c.custom_field.visibility_by_project_condition
                 end
                 filters_clauses << project_statement
                 filters_clauses.reject!(&:blank?)
                 filters_clauses.any? ? filters_clauses.join(' AND ') : nil
               end
               # Returns the sum of values for the given column
               def total_for(column)
                 total_with_scope(column, base_scope)
               end
               # Returns a hash of the sum of the given column for each group,
               # or nil if the query is not grouped
               def total_by_group_for(column)
                 grouped_query do |scope|
                   total_with_scope(column, scope)
                 end
               end
               def totals
                 totals = totalable_columns.map {|column| [column, total_for(column)]}
                 yield totals if block_given?
                 totals
               end
               def totals_by_group
                 totals = totalable_columns.map {|column| [column, total_by_group_for(column)]}
                 yield totals if block_given?
                 totals
               end
               private
               def grouped_query(&block)
                 r = nil
                 if grouped?
                   begin
                     # Rails3 will raise an (unexpected) RecordNotFound if there's only a nil group value
                     r = yield base_group_scope
                   rescue ActiveRecord::RecordNotFound
                     r = {nil => yield(base_scope)}
                   end
                   c = group_by_column
                   if c.is_a?(QueryCustomFieldColumn)
                     r = r.keys.inject({}) {|h, k| h[c.custom_field.cast_value(k)] = r[k]; h}
                   end
                 end
                 r
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               def total_with_scope(column, scope)
                 unless column.is_a?(QueryColumn)
                   column = column.to_sym
                   column = available_totalable_columns.detect {|c| c.name == column}
                 end
                 if column.is_a?(QueryCustomFieldColumn)
                   custom_field = column.custom_field
                   send "total_for_custom_field", custom_field, scope
                 else
                   send "total_for_#{column.name}", scope
                 end
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               def base_scope
                 raise "unimplemented"
               end
               def base_group_scope
                 base_scope.
                   joins(joins_for_order_statement(group_by_statement)).
                   group(group_by_statement)
               end
               def total_for_custom_field(custom_field, scope, &block)
                 total = custom_field.format.total_for_scope(custom_field, scope)
                 total = map_total(total) {|t| custom_field.format.cast_total_value(custom_field, t)}
                 total
               end
               def map_total(total, &block)
                 if total.is_a?(Hash)
                   total.keys.each {|k| total[k] = yield total[k]}
                 else
                   total = yield total
                 end
                 total
               end
               def sql_for_custom_field(field, operator, value, custom_field_id)
                 db_table = CustomValue.table_name
                 db_field = 'value'
                 filter = @available_filters[field]
                 return nil unless filter
                 if filter[:field].format.target_class && filter[:field].format.target_class <= User
                   if value.delete('me')
                     value.push User.current.id.to_s
                   end
                 end
                 not_in = nil
                 if operator == '!'
                   # Makes ! operator work for custom fields with multiple values
                   operator = '='
                   not_in = 'NOT'
                 end
                 customized_key = "id"
                 customized_class = queried_class
                 if field =~ /^(.+)\.cf_/
                   assoc = $1
                   customized_key = "#{assoc}_id"
                   customized_class = queried_class.reflect_on_association(assoc.to_sym).klass.base_class rescue nil
                   raise "Unknown #{queried_class.name} association #{assoc}" unless customized_class
                 end
                 where = sql_for_field(field, operator, value, db_table, db_field, true)
                 if operator =~ /[<>]/
                   where = "(#{where}) AND #{db_table}.#{db_field} <> ''"
                 end
                 "#{queried_table_name}.#{customized_key} #{not_in} IN (" +
                   "SELECT #{customized_class.table_name}.id FROM #{customized_class.table_name}" +
                   " LEFT OUTER JOIN #{db_table} ON #{db_table}.customized_type='#{customized_class}' AND #{db_table}.customized_id=#{customized_class.table_name}.id AND #{db_table}.custom_field_id=#{custom_field_id}" +
                   " WHERE (#{where}) AND (#{filter[:field].visibility_by_project_condition}))"
               end
               # Helper method to generate the WHERE sql for a +field+, +operator+ and a +value+
               def sql_for_field(field, operator, value, db_table, db_field, is_custom_filter=false)
                 sql = ''
                 case operator
                 when "="
                   if value.any?
                     case type_for(field)
                     when :date, :date_past
                       sql = date_clause(db_table, db_field, parse_date(value.first), parse_date(value.first), is_custom_filter)
                     when :integer
                       int_values = value.first.to_s.scan(/[+-]?\d+/).map(&:to_i).join(",")
                       if int_values.present?
                         if is_custom_filter
                           sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) IN (#{int_values}))"
                         else
                           sql = "#{db_table}.#{db_field} IN (#{int_values})"
                         end
                       else
                         sql = "1=0"
                       end
                     when :float
                       if is_custom_filter
                         sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) BETWEEN #{value.first.to_f - 1e-5} AND #{value.first.to_f + 1e-5})"
                       else
                         sql = "#{db_table}.#{db_field} BETWEEN #{value.first.to_f - 1e-5} AND #{value.first.to_f + 1e-5}"
                       end
                     else
                       sql = queried_class.send(:sanitize_sql_for_conditions, ["#{db_table}.#{db_field} IN (?)", value])
                     end
                   else
                     # IN an empty set
                     sql = "1=0"
                   end
                 when "!"
                   if value.any?
                     sql = queried_class.send(:sanitize_sql_for_conditions, ["(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (?))", value])
                   else
                     # NOT IN an empty set
                     sql = "1=1"
                   end
                 when "!*"
                   sql = "#{db_table}.#{db_field} IS NULL"
                   sql << " OR #{db_table}.#{db_field} = ''" if is_custom_filter
                 when "*"
                   sql = "#{db_table}.#{db_field} IS NOT NULL"
                   sql << " AND #{db_table}.#{db_field} <> ''" if is_custom_filter
                 when ">="
                   if [:date, :date_past].include?(type_for(field))
                     sql = date_clause(db_table, db_field, parse_date(value.first), nil, is_custom_filter)
                   else
                     if is_custom_filter
                       sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) >= #{value.first.to_f})"
                     else
                       sql = "#{db_table}.#{db_field} >= #{value.first.to_f}"
                     end
                   end
                 when "<="
                   if [:date, :date_past].include?(type_for(field))
                     sql = date_clause(db_table, db_field, nil, parse_date(value.first), is_custom_filter)
                   else
                     if is_custom_filter
                       sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) <= #{value.first.to_f})"
                     else
                       sql = "#{db_table}.#{db_field} <= #{value.first.to_f}"
                     end
                   end
                 when "><"
                   if [:date, :date_past].include?(type_for(field))
                     sql = date_clause(db_table, db_field, parse_date(value[0]), parse_date(value[1]), is_custom_filter)
                   else
                     if is_custom_filter
                       sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) BETWEEN #{value[0].to_f} AND #{value[1].to_f})"
                     else
                       sql = "#{db_table}.#{db_field} BETWEEN #{value[0].to_f} AND #{value[1].to_f}"
                     end
                   end
                 when "o"
                   sql = "#{queried_table_name}.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{self.class.connection.quoted_false})" if field == "status_id"
                 when "c"
                   sql = "#{queried_table_name}.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{self.class.connection.quoted_true})" if field == "status_id"
                 when "><t-"
                   # between today - n days and today
                   sql = relative_date_clause(db_table, db_field, - value.first.to_i, 0, is_custom_filter)
                 when ">t-"
                   # >= today - n days
                   sql = relative_date_clause(db_table, db_field, - value.first.to_i, nil, is_custom_filter)
                 when "<t-"
                   # <= today - n days
                   sql = relative_date_clause(db_table, db_field, nil, - value.first.to_i, is_custom_filter)
                 when "t-"
                   # = n days in past
                   sql = relative_date_clause(db_table, db_field, - value.first.to_i, - value.first.to_i, is_custom_filter)
                 when "><t+"
                   # between today and today + n days
                   sql = relative_date_clause(db_table, db_field, 0, value.first.to_i, is_custom_filter)
                 when ">t+"
                   # >= today + n days
                   sql = relative_date_clause(db_table, db_field, value.first.to_i, nil, is_custom_filter)
                 when "<t+"
                   # <= today + n days
                   sql = relative_date_clause(db_table, db_field, nil, value.first.to_i, is_custom_filter)
                 when "t+"
                   # = today + n days
                   sql = relative_date_clause(db_table, db_field, value.first.to_i, value.first.to_i, is_custom_filter)
                 when "t"
                   # = today
                   sql = relative_date_clause(db_table, db_field, 0, 0, is_custom_filter)
                 when "ld"
                   # = yesterday
                   sql = relative_date_clause(db_table, db_field, -1, -1, is_custom_filter)
                 when "w"
                   # = this week
                   first_day_of_week = l(:general_first_day_of_week).to_i
                   day_of_week = User.current.today.cwday
                   days_ago = (day_of_week >= first_day_of_week ? day_of_week - first_day_of_week : day_of_week + 7 - first_day_of_week)
                   sql = relative_date_clause(db_table, db_field, - days_ago, - days_ago + 6, is_custom_filter)
                 when "lw"
                   # = last week
                   first_day_of_week = l(:general_first_day_of_week).to_i
                   day_of_week = User.current.today.cwday
                   days_ago = (day_of_week >= first_day_of_week ? day_of_week - first_day_of_week : day_of_week + 7 - first_day_of_week)
                   sql = relative_date_clause(db_table, db_field, - days_ago - 7, - days_ago - 1, is_custom_filter)
                 when "l2w"
                   # = last 2 weeks
                   first_day_of_week = l(:general_first_day_of_week).to_i
                   day_of_week = User.current.today.cwday
                   days_ago = (day_of_week >= first_day_of_week ? day_of_week - first_day_of_week : day_of_week + 7 - first_day_of_week)
                   sql = relative_date_clause(db_table, db_field, - days_ago - 14, - days_ago - 1, is_custom_filter)
                 when "m"
                   # = this month
                   date = User.current.today
                   sql = date_clause(db_table, db_field, date.beginning_of_month, date.end_of_month, is_custom_filter)
                 when "lm"
                   # = last month
                   date = User.current.today.prev_month
                   sql = date_clause(db_table, db_field, date.beginning_of_month, date.end_of_month, is_custom_filter)
                 when "y"
                   # = this year
                   date = User.current.today
                   sql = date_clause(db_table, db_field, date.beginning_of_year, date.end_of_year, is_custom_filter)
                 when "~"
                   sql = sql_contains("#{db_table}.#{db_field}", value.first)
                 when "!~"
                   sql = sql_contains("#{db_table}.#{db_field}", value.first, false)
                 else
                   raise "Unknown query operator #{operator}"
                 end
                 return sql
               end
               # Returns a SQL LIKE statement with wildcards
               def sql_contains(db_field, value, match=true)
                 queried_class.send :sanitize_sql_for_conditions,
                   [Redmine::Database.like(db_field, '?', :match => match), "%#{value}%"]
               end
               # Adds a filter for the given custom field
               def add_custom_field_filter(field, assoc=nil)
                 options = field.query_filter_options(self)
                 if field.format.target_class && field.format.target_class <= User
                   if options[:values].is_a?(Array) && User.current.logged?
                     options[:values].unshift ["<< #{l(:label_me)} >>", "me"]
                   end
                 end
                 filter_id = "cf_#{field.id}"
                 filter_name = field.name
                 if assoc.present?
                   filter_id = "#{assoc}.#{filter_id}"
                   filter_name = l("label_attribute_of_#{assoc}", :name => filter_name)
                 end
                 add_available_filter filter_id, options.merge({
                   :name => filter_name,
                   :field => field
                 })
               end
               # Adds filters for the given custom fields scope
               def add_custom_fields_filters(scope, assoc=nil)
                 scope.visible.where(:is_filter => true).sorted.each do |field|
                   add_custom_field_filter(field, assoc)
                 end
               end
               # Adds filters for the given associations custom fields
               def add_associations_custom_fields_filters(*associations)
                 fields_by_class = CustomField.visible.where(:is_filter => true).group_by(&:class)
                 associations.each do |assoc|
                   association_klass = queried_class.reflect_on_association(assoc).klass
                   fields_by_class.each do |field_class, fields|
                     if field_class.customized_class <= association_klass
                       fields.sort.each do |field|
                         add_custom_field_filter(field, assoc)
                       end
                     end
                   end
                 end
               end
               def quoted_time(time, is_custom_filter)
                 if is_custom_filter
                   # Custom field values are stored as strings in the DB
                   # using this format that does not depend on DB date representation
                   time.strftime("%Y-%m-%d %H:%M:%S")
                 else
                   self.class.connection.quoted_date(time)
                 end
               end
               def date_for_user_time_zone(y, m, d)
                 if tz = User.current.time_zone
                   tz.local y, m, d
                 else
                   Time.local y, m, d
                 end
               end
               # Returns a SQL clause for a date or datetime field.
               def date_clause(table, field, from, to, is_custom_filter)
                 s = []
                 if from
                   if from.is_a?(Date)
                     from = date_for_user_time_zone(from.year, from.month, from.day).yesterday.end_of_day
                   else
                     from = from - 1 # second
                   end
                   if self.class.default_timezone == :utc
                     from = from.utc
                   end
                   s << ("#{table}.#{field} > '%s'" % [quoted_time(from, is_custom_filter)])
                 end
                 if to
                   if to.is_a?(Date)
                     to = date_for_user_time_zone(to.year, to.month, to.day).end_of_day
                   end
                   if self.class.default_timezone == :utc
                     to = to.utc
                   end
                   s << ("#{table}.#{field} <= '%s'" % [quoted_time(to, is_custom_filter)])
                 end
                 s.join(' AND ')
               end
               # Returns a SQL clause for a date or datetime field using relative dates.
               def relative_date_clause(table, field, days_from, days_to, is_custom_filter)
                 date_clause(table, field, (days_from ? User.current.today + days_from : nil), (days_to ? User.current.today + days_to : nil), is_custom_filter)
               end
               # Returns a Date or Time from the given filter value
               def parse_date(arg)
                 if arg.to_s =~ /\A\d{4}-\d{2}-\d{2}T/
                   Time.parse(arg) rescue nil
                 else
                   Date.parse(arg) rescue nil
                 end
               end
               # Additional joins required for the given sort options
               def joins_for_order_statement(order_options)
                 joins = []
                 if order_options
                   if order_options.include?('authors')
                     joins << "LEFT OUTER JOIN #{User.table_name} authors ON authors.id = #{queried_table_name}.author_id"
                   end
                   order_options.scan(/cf_\d+/).uniq.each do |name|
                     column = available_columns.detect {|c| c.name.to_s == name}
                     join = column && column.custom_field.join_for_order_statement
                     if join
                       joins << join
                     end
                   end
                 end
                 joins.any? ? joins.join(' ') : nil
               end
             end

app/models/time_entry_query.rb +21 0

             # Redmine - project management software
             # Copyright (C) 2006-2016  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 TimeEntryQuery < Query
               self.queried_class = TimeEntry
               self.view_permission = :view_time_entries
               self.available_columns = [
                 QueryColumn.new(:project, :sortable => "#{Project.table_name}.name", :groupable => true),
                 QueryColumn.new(:spent_on, :sortable => ["#{TimeEntry.table_name}.spent_on", "#{TimeEntry.table_name}.created_on"], :default_order => 'desc', :groupable => true),
                 QueryColumn.new(:tweek, :sortable => ["#{TimeEntry.table_name}.spent_on", "#{TimeEntry.table_name}.created_on"], :caption => l(:label_week)),
                 QueryColumn.new(:user, :sortable => lambda {User.fields_for_order_statement}, :groupable => true),
                 QueryColumn.new(:activity, :sortable => "#{TimeEntryActivity.table_name}.position", :groupable => true),
                 QueryColumn.new(:issue, :sortable => "#{Issue.table_name}.id"),
                 QueryColumn.new(:comments),
                 QueryColumn.new(:hours, :sortable => "#{TimeEntry.table_name}.hours"),
               ]
               def initialize(attributes=nil, *args)
                 super attributes
                 self.filters ||= {}
                 add_filter('spent_on', '*') unless filters.present?
               end
               def initialize_available_filters
                 add_available_filter "spent_on", :type => :date_past
                 principals = []
                 if project
                   principals += project.principals.visible.sort
                   unless project.leaf?
                     subprojects = project.descendants.visible.to_a
                     if subprojects.any?
                       add_available_filter "subproject_id",
                         :type => :list_subprojects,
                         :values => subprojects.collect{|s| [s.name, s.id.to_s] }
                       principals += Principal.member_of(subprojects).visible
                     end
                   end
                 else
                   if all_projects.any?
                     # members of visible projects
                     principals += Principal.member_of(all_projects).visible
                     # project filter
                     project_values = []
                     if User.current.logged? && User.current.memberships.any?
                       project_values << ["<< #{l(:label_my_projects).downcase} >>", "mine"]
                     end
                     project_values += all_projects_values
                     add_available_filter("project_id",
                       :type => :list, :values => project_values
                     ) unless project_values.empty?
                   end
                 end
+                add_available_filter("issue_id", :type => :tree, :label => :label_issue)
                 principals.uniq!
                 principals.sort!
                 users = principals.select {|p| p.is_a?(User)}
                 users_values = []
                 users_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
                 users_values += users.collect{|s| [s.name, s.id.to_s] }
                 add_available_filter("user_id",
                   :type => :list_optional, :values => users_values
                 ) unless users_values.empty?
                 activities = (project ? project.activities : TimeEntryActivity.shared)
                 add_available_filter("activity_id",
                   :type => :list, :values => activities.map {|a| [a.name, a.id.to_s]}
                 ) unless activities.empty?
                 add_available_filter "comments", :type => :text
                 add_available_filter "hours", :type => :float
                 add_custom_fields_filters(TimeEntryCustomField)
                 add_associations_custom_fields_filters :project, :issue, :user
               end
               def available_columns
                 return @available_columns if @available_columns
                 @available_columns = self.class.available_columns.dup
                 @available_columns += TimeEntryCustomField.visible.
                                         map {|cf| QueryCustomFieldColumn.new(cf) }
                 @available_columns += IssueCustomField.visible.
                                         map {|cf| QueryAssociationCustomFieldColumn.new(:issue, cf) }
                 @available_columns
               end
               def default_columns_names
                 @default_columns_names ||= [:project, :spent_on, :user, :activity, :issue, :comments, :hours]
               end
               def results_scope(options={})
                 order_option = [group_by_sort_order, options[:order]].flatten.reject(&:blank?)
                 TimeEntry.visible.
                   where(statement).
                   order(order_option).
                   joins(joins_for_order_statement(order_option.join(','))).
                   includes(:activity).
                   references(:activity)
               end
+              def sql_for_issue_id_field(field, operator, value)
+                case operator
+                when "="
+                  "#{TimeEntry.table_name}.issue_id = #{value.first.to_i}"
+                when "~"
+                  issue = Issue.where(:id => value.first.to_i).first
+                  if issue && (issue_ids = issue.self_and_descendants.pluck(:id)).any?
+                    "#{TimeEntry.table_name}.issue_id IN (#{issue_ids.join(',')})"
+                  else
+                    "1=0"
+                  end
+                when "!*"
+                  "#{TimeEntry.table_name}.issue_id IS NULL"
+                when "*"
+                  "#{TimeEntry.table_name}.issue_id IS NOT NULL"
+                end
+              end
               def sql_for_activity_id_field(field, operator, value)
                 condition_on_id = sql_for_field(field, operator, value, Enumeration.table_name, 'id')
                 condition_on_parent_id = sql_for_field(field, operator, value, Enumeration.table_name, 'parent_id')
                 ids = value.map(&:to_i).join(',')
                 table_name = Enumeration.table_name
                 if operator == '='
                   "(#{table_name}.id IN (#{ids}) OR #{table_name}.parent_id IN (#{ids}))"
                 else
                   "(#{table_name}.id NOT IN (#{ids}) AND (#{table_name}.parent_id IS NULL OR #{table_name}.parent_id NOT IN (#{ids})))"
                 end
               end
               # Accepts :from/:to params as shortcut filters
               def build_from_params(params)
                 super
                 if params[:from].present? && params[:to].present?
                   add_filter('spent_on', '><', [params[:from], params[:to]])
                 elsif params[:from].present?
                   add_filter('spent_on', '>=', [params[:from]])
                 elsif params[:to].present?
                   add_filter('spent_on', '<=', [params[:to]])
                 end
                 self
               end
             end

app/views/timelog/_date_range.html.erb +3 -3

             <div id="query_form_with_buttons" class="hide-when-print">
             <%= hidden_field_tag 'set_filter', '1' %>
             <div id="query_form_content">
               <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
                 <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
                 <div style="<%= @query.new_record? ? "" : "display: none;" %>">
                   <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
                 </div>
               </fieldset>
               <fieldset id="options" class="collapsible collapsed">
                 <legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
                 <div style="display: none;">
                   <table>
                     <tr>
                       <td class="field"><%= l(:field_column_names) %></td>
                       <td><%= render_query_columns_selection(@query) %></td>
                     </tr>
                   </table>
                 </div>
               </fieldset>
             </div>
             <p class="buttons">
               <%= link_to_function l(:button_apply), '$("#query_form").submit()', :class => 'icon icon-checked' %>
               <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue}, :class => 'icon icon-reload'  %>
               <% if @query.new_record? %>
                 <% if User.current.allowed_to?(:save_queries, @project, :global => true) %>
                   <%= link_to_function l(:button_save),
                                        "$('#query_form').attr('action', '#{ @project ? new_project_query_path(@project) : new_query_path }').submit()",
                                        :class => 'icon icon-save' %>
                 <% end %>
               <% else %>
                 <% if @query.editable_by?(User.current) %>
                   <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
                   <%= delete_link query_path(@query) %>
                 <% end %>
               <% end %>
             </p>
             <%= hidden_field_tag 'type', 'TimeEntryQuery' %>
             </div>
             <div class="tabs hide-when-print">
-            <% query_params = params.slice(:f, :op, :v, :sort, :query_id) %>
+            <% query_params = request.query_parameters %>
             <ul>
-                <li><%= link_to(l(:label_details), _time_entries_path(@project, @issue, query_params),
+                <li><%= link_to(l(:label_details), _time_entries_path(@project, nil, :params => query_params),
                                                    :class => (action_name == 'index' ? 'selected' : nil)) %></li>
-                <li><%= link_to(l(:label_report), _report_time_entries_path(@project, @issue, query_params),
+                <li><%= link_to(l(:label_report), _report_time_entries_path(@project, nil, :params => query_params),
                                                    :class => (action_name == 'report' ? 'selected' : nil)) %></li>
             </ul>
             </div>

app/views/timelog/index.html.erb +1 -3

             <div class="contextual">
             <%= link_to l(:button_log_time),
                         _new_time_entry_path(@project, @issue),
                         :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
             </div>
-            <%= render_timelog_breadcrumb %>
             <h2><%= @query.new_record? ? l(:label_spent_time) : @query.name %></h2>
-            <%= form_tag(params.slice(:project_id, :issue_id), :method => :get, :id => 'query_form') do %>
+            <%= form_tag(_time_entries_path(@project, nil), :method => :get, :id => 'query_form') do %>
             <%= render :partial => 'date_range' %>
             <% end %>
             <div class="total-hours">
             <p><%= l(:label_total_time) %>: <%= html_hours(l_hours(@total_hours)) %></p>
             </div>
             <% unless @entries.empty? %>
             <%= render :partial => 'list', :locals => { :entries => @entries }%>
             <span class="pagination"><%= pagination_links_full @entry_pages, @entry_count %></span>
             <% other_formats_links do |f| %>
               <%= f.link_to_with_query_parameters 'Atom', :key => User.current.rss_key %>
               <%= f.link_to_with_query_parameters 'CSV', {}, :onclick => "showModal('csv-export-options', '330px'); return false;" %>
             <% end %>
             <div id="csv-export-options" style="display:none;">
               <h3 class="title"><%= l(:label_export_options, :export_format => 'CSV') %></h3>
               <%= form_tag(params.slice(:project_id, :issue_id).merge(:format => 'csv', :page=>nil), :method => :get, :id => 'csv-export-form') do %>
               <%= query_hidden_tags @query %>
               <p>
                 <label><%= radio_button_tag 'columns', '', true %> <%= l(:description_selected_columns) %></label><br />
                 <label><%= radio_button_tag 'columns', 'all' %> <%= l(:description_all_columns) %></label>
               </p>
               <p class="buttons">
                 <%= submit_tag l(:button_export), :name => nil, :onclick => "hideModal(this);" %>
                 <%= submit_tag l(:button_cancel), :name => nil, :onclick => "hideModal(this);", :type => 'button' %>
               </p>
               <% end %>
             </div>
             <% end %>
             <% content_for :sidebar do %>
               <%= render_sidebar_queries(TimeEntryQuery, @project) %>
             <% end %>
             <% html_title(@query.new_record? ? l(:label_spent_time) : @query.name, l(:label_details)) %>
             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom, {:issue_id => @issue, :format => 'atom', :key => User.current.rss_key}, :title => l(:label_spent_time)) %>
             <% end %>

app/views/timelog/report.html.erb +1 -3

             <div class="contextual">
             <%= link_to l(:button_log_time),
                         _new_time_entry_path(@project, @issue),
                         :class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
             </div>
-            <%= render_timelog_breadcrumb %>
             <h2><%= @query.new_record? ? l(:label_spent_time) : @query.name %></h2>
-            <%= form_tag(params.slice(:project_id, :issue_id), :method => :get, :id => 'query_form') do %>
+            <%= form_tag(_report_time_entries_path(@project, nil), :method => :get, :id => 'query_form') do %>
               <% @report.criteria.each do |criterion| %>
                 <%= hidden_field_tag 'criteria[]', criterion, :id => nil %>
               <% end %>
               <%= render :partial => 'timelog/date_range' %>
               <p><label for='columns'><%= l(:label_details) %></label>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
                                                                                         [l(:label_month), 'month'],
                                                                                         [l(:label_week), 'week'],
                                                                                         [l(:label_day_plural).titleize, 'day']], @report.columns),
                                                                     :onchange => "this.form.submit();" %>
               <label for='criterias'><%= l(:button_add) %></label>: <%= select_tag('criteria[]', options_for_select([[]] + (@report.available_criteria.keys - @report.criteria).collect{|k| [l_or_humanize(@report.available_criteria[k][:label]), k]}),
                                                                       :onchange => "this.form.submit();",
                                                                       :style => 'width: 200px',
                                                                       :disabled => (@report.criteria.length >= 3),
                                                                       :id => "criterias") %>
                  <%= link_to l(:button_clear), {:project_id => @project, :issue_id => @issue, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @report.columns}, :class => 'icon icon-reload' %></p>
             <% end %>
             <% unless @report.criteria.empty? %>
             <div class="total-hours">
             <p><%= l(:label_total_time) %>: <%= html_hours(l_hours(@report.total_hours)) %></p>
             </div>
             <% unless @report.hours.empty? %>
             <div class="autoscroll">
             <table class="list" id="time-report">
             <thead>
             <tr>
             <% @report.criteria.each do |criteria| %>
               <th><%= l_or_humanize(@report.available_criteria[criteria][:label]) %></th>
             <% end %>
             <% columns_width = (40 / (@report.periods.length+1)).to_i %>
             <% @report.periods.each do |period| %>
               <th class="period" style="width:<%= columns_width %>%;"><%= period %></th>
             <% end %>
               <th class="total" style="width:<%= columns_width %>%;"><%= l(:label_total_time) %></th>
             </tr>
             </thead>
             <tbody>
             <%= render :partial => 'report_criteria', :locals => {:criterias => @report.criteria, :hours => @report.hours, :level => 0} %>
               <tr class="total">
               <td><%= l(:label_total_time) %></td>
               <%= ('<td></td>' * (@report.criteria.size - 1)).html_safe %>
               <% total = 0 -%>
               <% @report.periods.each do |period| -%>
                 <% sum = sum_hours(select_hours(@report.hours, @report.columns, period.to_s)); total += sum -%>
                 <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
               <% end -%>
               <td class="hours"><%= html_hours("%.2f" % total) if total > 0 %></td>
               </tr>
             </tbody>
             </table>
             </div>
             <% other_formats_links do |f| %>
               <%= f.link_to 'CSV', :url => params %>
             <% end %>
             <% end %>
             <% end %>
             <% content_for :sidebar do %>
               <%= render_sidebar_queries(TimeEntryQuery, @project) %>
             <% end %>
             <% html_title(@query.new_record? ? l(:label_spent_time) : @query.name, l(:label_report)) %>

config/routes.rb +1 -5

             # Redmine - project management software
             # Copyright (C) 2006-2016  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.
             Rails.application.routes.draw do
               root :to => 'welcome#index', :as => 'home'
               match 'login', :to => 'account#login', :as => 'signin', :via => [:get, :post]
               match 'logout', :to => 'account#logout', :as => 'signout', :via => [:get, :post]
               match 'account/register', :to => 'account#register', :via => [:get, :post], :as => 'register'
               match 'account/lost_password', :to => 'account#lost_password', :via => [:get, :post], :as => 'lost_password'
               match 'account/activate', :to => 'account#activate', :via => :get
               get 'account/activation_email', :to => 'account#activation_email', :as => 'activation_email'
               match '/news/preview', :controller => 'previews', :action => 'news', :as => 'preview_news', :via => [:get, :post, :put, :patch]
               match '/issues/preview/new/:project_id', :to => 'previews#issue', :as => 'preview_new_issue', :via => [:get, :post, :put, :patch]
               match '/issues/preview/edit/:id', :to => 'previews#issue', :as => 'preview_edit_issue', :via => [:get, :post, :put, :patch]
               match '/issues/preview', :to => 'previews#issue', :as => 'preview_issue', :via => [:get, :post, :put, :patch]
               match 'projects/:id/wiki', :to => 'wikis#edit', :via => :post
               match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post]
               match 'boards/:board_id/topics/new', :to => 'messages#new', :via => [:get, :post], :as => 'new_board_message'
               get 'boards/:board_id/topics/:id', :to => 'messages#show', :as => 'board_message'
               match 'boards/:board_id/topics/quote/:id', :to => 'messages#quote', :via => [:get, :post]
               get 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
               post 'boards/:board_id/topics/preview', :to => 'messages#preview', :as => 'preview_board_message'
               post 'boards/:board_id/topics/:id/replies', :to => 'messages#reply'
               post 'boards/:board_id/topics/:id/edit', :to => 'messages#edit'
               post 'boards/:board_id/topics/:id/destroy', :to => 'messages#destroy'
               # Misc issue routes. TODO: move into resources
               match '/issues/auto_complete', :to => 'auto_completes#issues', :via => :get, :as => 'auto_complete_issues'
               match '/issues/context_menu', :to => 'context_menus#issues', :as => 'issues_context_menu', :via => [:get, :post]
               match '/issues/changes', :to => 'journals#index', :as => 'issue_changes', :via => :get
               match '/issues/:id/quoted', :to => 'journals#new', :id => /\d+/, :via => :post, :as => 'quoted_issue'
               resources :journals, :only => [:edit, :update] do
                 member do
                   get 'diff'
                 end
               end
               get '/projects/:project_id/issues/gantt', :to => 'gantts#show', :as => 'project_gantt'
               get '/issues/gantt', :to => 'gantts#show'
               get '/projects/:project_id/issues/calendar', :to => 'calendars#show', :as => 'project_calendar'
               get '/issues/calendar', :to => 'calendars#show'
               get 'projects/:id/issues/report', :to => 'reports#issue_report', :as => 'project_issues_report'
               get 'projects/:id/issues/report/:detail', :to => 'reports#issue_report_details', :as => 'project_issues_report_details'
               get   '/issues/imports/new', :to => 'imports#new', :as => 'new_issues_import'
               post  '/imports', :to => 'imports#create', :as => 'imports'
               get   '/imports/:id', :to => 'imports#show', :as => 'import'
               match '/imports/:id/settings', :to => 'imports#settings', :via => [:get, :post], :as => 'import_settings'
               match '/imports/:id/mapping', :to => 'imports#mapping', :via => [:get, :post], :as => 'import_mapping'
               match '/imports/:id/run', :to => 'imports#run', :via => [:get, :post], :as => 'import_run'
               match 'my/account', :controller => 'my', :action => 'account', :via => [:get, :post]
               match 'my/account/destroy', :controller => 'my', :action => 'destroy', :via => [:get, :post]
               match 'my/page', :controller => 'my', :action => 'page', :via => :get
               match 'my', :controller => 'my', :action => 'index', :via => :get # Redirects to my/page
               get 'my/api_key', :to => 'my#show_api_key', :as => 'my_api_key'
               post 'my/api_key', :to => 'my#reset_api_key'
               post 'my/rss_key', :to => 'my#reset_rss_key', :as => 'my_rss_key'
               match 'my/password', :controller => 'my', :action => 'password', :via => [:get, :post]
               match 'my/page_layout', :controller => 'my', :action => 'page_layout', :via => :get
               match 'my/add_block', :controller => 'my', :action => 'add_block', :via => :post
               match 'my/remove_block', :controller => 'my', :action => 'remove_block', :via => :post
               match 'my/order_blocks', :controller => 'my', :action => 'order_blocks', :via => :post
               resources :users do
                 resources :memberships, :controller => 'principal_memberships'
                 resources :email_addresses, :only => [:index, :create, :update, :destroy]
               end
               post 'watchers/watch', :to => 'watchers#watch', :as => 'watch'
               delete 'watchers/watch', :to => 'watchers#unwatch'
               get 'watchers/new', :to => 'watchers#new', :as => 'new_watchers'
               post 'watchers', :to => 'watchers#create'
               post 'watchers/append', :to => 'watchers#append'
               delete 'watchers', :to => 'watchers#destroy'
               get 'watchers/autocomplete_for_user', :to => 'watchers#autocomplete_for_user'
               # Specific routes for issue watchers API
               post 'issues/:object_id/watchers', :to => 'watchers#create', :object_type => 'issue'
               delete 'issues/:object_id/watchers/:user_id' => 'watchers#destroy', :object_type => 'issue'
               resources :projects do
                 member do
                   get 'settings(/:tab)', :action => 'settings', :as => 'settings'
                   post 'modules'
                   post 'archive'
                   post 'unarchive'
                   post 'close'
                   post 'reopen'
                   match 'copy', :via => [:get, :post]
                 end
                 shallow do
                   resources :memberships, :controller => 'members', :only => [:index, :show, :new, :create, :update, :destroy] do
                     collection do
                       get 'autocomplete'
                     end
                   end
                 end
                 resource :enumerations, :controller => 'project_enumerations', :only => [:update, :destroy]
                 get 'issues/:copy_from/copy', :to => 'issues#new', :as => 'copy_issue'
                 resources :issues, :only => [:index, :new, :create]
                 # Used when updating the form of a new issue
                 post 'issues/new', :to => 'issues#new'
                 resources :files, :only => [:index, :new, :create]
                 resources :versions, :except => [:index, :show, :edit, :update, :destroy] do
                   collection do
                     put 'close_completed'
                   end
                 end
                 get 'versions.:format', :to => 'versions#index'
                 get 'roadmap', :to => 'versions#index', :format => false
                 get 'versions', :to => 'versions#index'
                 resources :news, :except => [:show, :edit, :update, :destroy]
                 resources :time_entries, :controller => 'timelog', :except => [:show, :edit, :update, :destroy] do
                   get 'report', :on => :collection
                 end
                 resources :queries, :only => [:new, :create]
                 shallow do
                   resources :issue_categories
                 end
                 resources :documents, :except => [:show, :edit, :update, :destroy]
                 resources :boards
                 shallow do
                   resources :repositories, :except => [:index, :show] do
                     member do
                       match 'committers', :via => [:get, :post]
                     end
                   end
                 end
                 match 'wiki/index', :controller => 'wiki', :action => 'index', :via => :get
                 resources :wiki, :except => [:index, :create], :as => 'wiki_page' do
                   member do
                     get 'rename'
                     post 'rename'
                     get 'history'
                     get 'diff'
                     match 'preview', :via => [:post, :put, :patch]
                     post 'protect'
                     post 'add_attachment'
                   end
                   collection do
                     get 'export'
                     get 'date_index'
                     post 'new'
                   end
                 end
                 match 'wiki', :controller => 'wiki', :action => 'show', :via => :get
                 get 'wiki/:id/:version', :to => 'wiki#show', :constraints => {:version => /\d+/}
                 delete 'wiki/:id/:version', :to => 'wiki#destroy_version'
                 get 'wiki/:id/:version/annotate', :to => 'wiki#annotate'
                 get 'wiki/:id/:version/diff', :to => 'wiki#diff'
               end
               resources :issues do
                 member do
                   # Used when updating the form of an existing issue
                   patch 'edit', :to => 'issues#edit'
                 end
                 collection do
                   match 'bulk_edit', :via => [:get, :post]
                   post 'bulk_update'
                 end
-                resources :time_entries, :controller => 'timelog', :except => [:show, :edit, :update, :destroy] do
+                resources :time_entries, :controller => 'timelog', :only => [:new, :create]
-                  collection do
-                    get 'report'
-                  end
-                end
                 shallow do
                   resources :relations, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
                 end
               end
               # Used when updating the form of a new issue outside a project
               post '/issues/new', :to => 'issues#new'
               match '/issues', :controller => 'issues', :action => 'destroy', :via => :delete
               resources :queries, :except => [:show]
               resources :news, :only => [:index, :show, :edit, :update, :destroy]
               match '/news/:id/comments', :to => 'comments#create', :via => :post
               match '/news/:id/comments/:comment_id', :to => 'comments#destroy', :via => :delete
               resources :versions, :only => [:show, :edit, :update, :destroy] do
                 post 'status_by', :on => :member
               end
               resources :documents, :only => [:show, :edit, :update, :destroy] do
                 post 'add_attachment', :on => :member
               end
               match '/time_entries/context_menu', :to => 'context_menus#time_entries', :as => :time_entries_context_menu, :via => [:get, :post]
               resources :time_entries, :controller => 'timelog', :except => :destroy do
                 collection do
                   get 'report'
                   get 'bulk_edit'
                   post 'bulk_update'
                 end
               end
               match '/time_entries/:id', :to => 'timelog#destroy', :via => :delete, :id => /\d+/
               # TODO: delete /time_entries for bulk deletion
               match '/time_entries/destroy', :to => 'timelog#destroy', :via => :delete
               # Used to update the new time entry form
               post '/time_entries/new', :to => 'timelog#new'
               get 'projects/:id/activity', :to => 'activities#index', :as => :project_activity
               get 'activity', :to => 'activities#index'
               # repositories routes
               get 'projects/:id/repository/:repository_id/statistics', :to => 'repositories#stats'
               get 'projects/:id/repository/:repository_id/graph', :to => 'repositories#graph'
               get 'projects/:id/repository/:repository_id/changes(/*path)',
                   :to => 'repositories#changes',
                   :format => false
               get 'projects/:id/repository/:repository_id/revisions/:rev', :to => 'repositories#revision'
               get 'projects/:id/repository/:repository_id/revision', :to => 'repositories#revision'
               post   'projects/:id/repository/:repository_id/revisions/:rev/issues', :to => 'repositories#add_related_issue'
               delete 'projects/:id/repository/:repository_id/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
               get 'projects/:id/repository/:repository_id/revisions', :to => 'repositories#revisions'
               %w(browse show entry raw annotate diff).each do |action|
                 get "projects/:id/repository/:repository_id/revisions/:rev/#{action}(/*path)",
                     :controller => 'repositories',
                     :action => action,
                     :format => false,
                     :constraints => {:rev => /[a-z0-9\.\-_]+/}
               end
               get 'projects/:id/repository/statistics', :to => 'repositories#stats'
               get 'projects/:id/repository/graph', :to => 'repositories#graph'
               get 'projects/:id/repository/changes(/*path)',
                   :to => 'repositories#changes',
                   :format => false
               get 'projects/:id/repository/revisions', :to => 'repositories#revisions'
               get 'projects/:id/repository/revisions/:rev', :to => 'repositories#revision'
               get 'projects/:id/repository/revision', :to => 'repositories#revision'
               post   'projects/:id/repository/revisions/:rev/issues', :to => 'repositories#add_related_issue'
               delete 'projects/:id/repository/revisions/:rev/issues/:issue_id', :to => 'repositories#remove_related_issue'
               %w(browse show entry raw annotate diff).each do |action|
                 get "projects/:id/repository/revisions/:rev/#{action}(/*path)",
                     :controller => 'repositories',
                     :action => action,
                     :format => false,
                     :constraints => {:rev => /[a-z0-9\.\-_]+/}
               end
               %w(browse entry raw changes annotate diff).each do |action|
                 get "projects/:id/repository/:repository_id/#{action}(/*path)",
                     :controller => 'repositories',
                     :action => action,
                     :format => false
               end
               %w(browse entry raw changes annotate diff).each do |action|
                 get "projects/:id/repository/#{action}(/*path)",
                     :controller => 'repositories',
                     :action => action,
                     :format => false
               end
               get 'projects/:id/repository/:repository_id/show/*path', :to => 'repositories#show', :format => false
               get 'projects/:id/repository/show/*path', :to => 'repositories#show', :format => false
               get 'projects/:id/repository/:repository_id', :to => 'repositories#show', :path => nil
               get 'projects/:id/repository', :to => 'repositories#show', :path => nil
               # additional routes for having the file name at the end of url
               get 'attachments/:id/:filename', :to => 'attachments#show', :id => /\d+/, :filename => /.*/, :as => 'named_attachment'
               get 'attachments/download/:id/:filename', :to => 'attachments#download', :id => /\d+/, :filename => /.*/, :as => 'download_named_attachment'
               get 'attachments/download/:id', :to => 'attachments#download', :id => /\d+/
               get 'attachments/thumbnail/:id(/:size)', :to => 'attachments#thumbnail', :id => /\d+/, :size => /\d+/, :as => 'thumbnail'
               resources :attachments, :only => [:show, :destroy]
               get 'attachments/:object_type/:object_id/edit', :to => 'attachments#edit', :as => :object_attachments_edit
               patch 'attachments/:object_type/:object_id', :to => 'attachments#update', :as => :object_attachments
               resources :groups do
                 resources :memberships, :controller => 'principal_memberships'
                 member do
                   get 'autocomplete_for_user'
                 end
               end
               get 'groups/:id/users/new', :to => 'groups#new_users', :id => /\d+/, :as => 'new_group_users'
               post 'groups/:id/users', :to => 'groups#add_users', :id => /\d+/, :as => 'group_users'
               delete 'groups/:id/users/:user_id', :to => 'groups#remove_user', :id => /\d+/, :as => 'group_user'
               resources :trackers, :except => :show do
                 collection do
                   match 'fields', :via => [:get, :post]
                 end
               end
               resources :issue_statuses, :except => :show do
                 collection do
                   post 'update_issue_done_ratio'
                 end
               end
               resources :custom_fields, :except => :show do
                 resources :enumerations, :controller => 'custom_field_enumerations', :except => [:show, :new, :edit]
                 put 'enumerations', :to => 'custom_field_enumerations#update_each'
               end
               resources :roles do
                 collection do
                   match 'permissions', :via => [:get, :post]
                 end
               end
               resources :enumerations, :except => :show
               match 'enumerations/:type', :to => 'enumerations#index', :via => :get
               get 'projects/:id/search', :controller => 'search', :action => 'index'
               get 'search', :controller => 'search', :action => 'index'
               get  'mail_handler', :to => 'mail_handler#new'
               post 'mail_handler', :to => 'mail_handler#index'
               get 'admin', :to => 'admin#index'
               get 'admin/projects', :to => 'admin#projects'
               get 'admin/plugins', :to => 'admin#plugins'
               get 'admin/info', :to => 'admin#info'
               post 'admin/test_email', :to => 'admin#test_email', :as => 'test_email'
               post 'admin/default_configuration', :to => 'admin#default_configuration'
               resources :auth_sources do
                 member do
                   get 'test_connection', :as => 'try_connection'
                 end
                 collection do
                   get 'autocomplete_for_new_user'
                 end
               end
               match 'workflows', :controller => 'workflows', :action => 'index', :via => :get
               match 'workflows/edit', :controller => 'workflows', :action => 'edit', :via => [:get, :post]
               match 'workflows/permissions', :controller => 'workflows', :action => 'permissions', :via => [:get, :post]
               match 'workflows/copy', :controller => 'workflows', :action => 'copy', :via => [:get, :post]
               match 'settings', :controller => 'settings', :action => 'index', :via => :get
               match 'settings/edit', :controller => 'settings', :action => 'edit', :via => [:get, :post]
               match 'settings/plugin/:id', :controller => 'settings', :action => 'plugin', :via => [:get, :post], :as => 'plugin_settings'
               match 'sys/projects', :to => 'sys#projects', :via => :get
               match 'sys/projects/:id/repository', :to => 'sys#create_project_repository', :via => :post
               match 'sys/fetch_changesets', :to => 'sys#fetch_changesets', :via => [:get, :post]
               match 'uploads', :to => 'attachments#upload', :via => :post
               get 'robots.txt', :to => 'welcome#robots'
               Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir|
                 file = File.join(plugin_dir, "config/routes.rb")
                 if File.exists?(file)
                   begin
                     instance_eval File.read(file)
                   rescue Exception => e
                     puts "An error occurred while loading the routes definition of #{File.basename(plugin_dir)} plugin (#{file}): #{e.message}."
                     exit 1
                   end
                 end
               end
             end

test/functional/time_entry_reports_controller_test.rb 0 -9

             # -*- coding: utf-8 -*-
             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class TimeEntryReportsControllerTest < ActionController::TestCase
               tests TimelogController
               fixtures :projects, :enabled_modules, :roles, :members, :member_roles,
                        :email_addresses,
                        :issues, :time_entries, :users, :trackers, :enumerations,
                        :issue_statuses, :custom_fields, :custom_values,
                        :projects_trackers, :custom_fields_trackers,
                        :custom_fields_projects
               include Redmine::I18n
               def setup
                 Setting.default_language = "en"
               end
               def test_report_at_project_level
                 get :report, :project_id => 'ecookbook'
                 assert_response :success
                 assert_template 'report'
                 assert_select 'form#query_form[action=?]', '/projects/ecookbook/time_entries/report'
               end
               def test_report_all_projects
                 get :report
                 assert_response :success
                 assert_template 'report'
                 assert_select 'form#query_form[action=?]', '/time_entries/report'
               end
               def test_report_all_projects_denied
                 r = Role.anonymous
                 r.permissions.delete(:view_time_entries)
                 r.permissions_will_change!
                 r.save
                 get :report
                 assert_redirected_to '/login?back_url=http%3A%2F%2Ftest.host%2Ftime_entries%2Freport'
               end
               def test_report_all_projects_one_criteria
                 get :report, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criteria => ['project']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:report)
                 assert_equal "8.65", "%.2f" % assigns(:report).total_hours
               end
               def test_report_all_time
                 get :report, :project_id => 1, :criteria => ['project', 'issue']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:report)
                 assert_equal "162.90", "%.2f" % assigns(:report).total_hours
               end
               def test_report_all_time_by_day
                 get :report, :project_id => 1, :criteria => ['project', 'issue'], :columns => 'day'
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:report)
                 assert_equal "162.90", "%.2f" % assigns(:report).total_hours
                 assert_select 'th', :text => '2007-03-12'
               end
               def test_report_one_criteria
                 get :report, :project_id => 1, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criteria => ['project']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:report)
                 assert_equal "8.65", "%.2f" % assigns(:report).total_hours
               end
               def test_report_two_criteria
                 get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criteria => ["user", "activity"]
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:report)
                 assert_equal "162.90", "%.2f" % assigns(:report).total_hours
               end
               def test_report_custom_field_criteria_with_multiple_values_on_single_value_custom_field_should_not_fail
                 field = TimeEntryCustomField.create!(:name => 'multi', :field_format => 'list', :possible_values => ['value1', 'value2'])
                 entry = TimeEntry.create!(:project => Project.find(1), :hours => 1, :activity_id => 10, :user => User.find(2), :spent_on => Date.today)
                 CustomValue.create!(:customized => entry, :custom_field => field, :value => 'value1')
                 CustomValue.create!(:customized => entry, :custom_field => field, :value => 'value2')
                 get :report, :project_id => 1, :columns => 'day', :criteria => ["cf_#{field.id}"]
                 assert_response :success
               end
               def test_report_multiple_values_custom_fields_should_not_be_proposed
                 TimeEntryCustomField.create!(:name => 'Single', :field_format => 'list', :possible_values => ['value1', 'value2'])
                 TimeEntryCustomField.create!(:name => 'Multi', :field_format => 'list', :multiple => true, :possible_values => ['value1', 'value2'])
                 get :report, :project_id => 1
                 assert_response :success
                 assert_select 'select[name=?]', 'criteria[]' do
                   assert_select 'option', :text => 'Single'
                   assert_select 'option', :text => 'Multi', :count => 0
                 end
               end
               def test_report_one_day
                 get :report, :project_id => 1, :columns => 'day', :from => "2007-03-23", :to => "2007-03-23", :criteria => ["user", "activity"]
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:report)
                 assert_equal "4.25", "%.2f" % assigns(:report).total_hours
               end
-              def test_report_at_issue_level
-                get :report, :issue_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criteria => ["user", "activity"]
-                assert_response :success
-                assert_template 'report'
-                assert_not_nil assigns(:report)
-                assert_equal "154.25", "%.2f" % assigns(:report).total_hours
-                assert_select 'form#query_form[action=?]', '/issues/1/time_entries/report'
-              end
               def test_report_by_week_should_use_commercial_year
                 TimeEntry.delete_all
                 TimeEntry.generate!(:hours => '2', :spent_on => '2009-12-25') # 2009-52
                 TimeEntry.generate!(:hours => '4', :spent_on => '2009-12-31') # 2009-53
                 TimeEntry.generate!(:hours => '8', :spent_on => '2010-01-01') # 2009-53
                 TimeEntry.generate!(:hours => '16', :spent_on => '2010-01-05') # 2010-1
                 get :report, :columns => 'week', :from => "2009-12-25", :to => "2010-01-05", :criteria => ["project"]
                 assert_response :success
                 assert_select '#time-report thead tr' do
                   assert_select 'th:nth-child(1)', :text => 'Project'
                   assert_select 'th:nth-child(2)', :text => '2009-52'
                   assert_select 'th:nth-child(3)', :text => '2009-53'
                   assert_select 'th:nth-child(4)', :text => '2010-1'
                   assert_select 'th:nth-child(5)', :text => 'Total time'
                 end
                 assert_select '#time-report tbody tr' do
                   assert_select 'td:nth-child(1)', :text => 'eCookbook'
                   assert_select 'td:nth-child(2)', :text => '2.00'
                   assert_select 'td:nth-child(3)', :text => '12.00'
                   assert_select 'td:nth-child(4)', :text => '16.00'
                   assert_select 'td:nth-child(5)', :text => '30.00' # Total
                 end
               end
               def test_report_should_propose_association_custom_fields
                 get :report
                 assert_response :success
                 assert_template 'report'
                 assert_select 'select[name=?]', 'criteria[]' do
                   assert_select 'option[value=cf_1]', {:text => 'Database'}, 'Issue custom field not found'
                   assert_select 'option[value=cf_3]', {:text => 'Development status'}, 'Project custom field not found'
                   assert_select 'option[value=cf_7]', {:text => 'Billable'}, 'TimeEntryActivity custom field not found'
                 end
               end
               def test_report_with_association_custom_fields
                 get :report, :criteria => ['cf_1', 'cf_3', 'cf_7']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:report)
                 assert_equal 3, assigns(:report).criteria.size
                 assert_equal "162.90", "%.2f" % assigns(:report).total_hours
                 # Custom fields columns
                 assert_select 'th', :text => 'Database'
                 assert_select 'th', :text => 'Development status'
                 assert_select 'th', :text => 'Billable'
                 # Custom field row
                 assert_select 'tr' do
                   assert_select 'td', :text => 'MySQL'
                   assert_select 'td.hours', :text => '1.00'
                 end
               end
               def test_report_one_criteria_no_result
                 get :report, :project_id => 1, :columns => 'week', :from => "1998-04-01", :to => "1998-04-30", :criteria => ['project']
                 assert_response :success
                 assert_template 'report'
                 assert_not_nil assigns(:report)
                 assert_equal "0.00", "%.2f" % assigns(:report).total_hours
               end
               def test_report_status_criterion
                 get :report, :project_id => 1, :criteria => ['status']
                 assert_response :success
                 assert_template 'report'
                 assert_select 'th', :text => 'Status'
                 assert_select 'td', :text => 'New'
               end
               def test_report_all_projects_csv_export
                 get :report, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30",
                     :criteria => ["project", "user", "activity"], :format => "csv"
                 assert_response :success
                 assert_equal 'text/csv; header=present', @response.content_type
                 lines = @response.body.chomp.split("\n")
                 # Headers
                 assert_equal 'Project,User,Activity,2007-3,2007-4,Total time', lines.first
                 # Total row
                 assert_equal 'Total time,"","",154.25,8.65,162.90', lines.last
               end
               def test_report_csv_export
                 get :report, :project_id => 1, :columns => 'month',
                     :from => "2007-01-01", :to => "2007-06-30",
                     :criteria => ["project", "user", "activity"], :format => "csv"
                 assert_response :success
                 assert_equal 'text/csv; header=present', @response.content_type
                 lines = @response.body.chomp.split("\n")
                 # Headers
                 assert_equal 'Project,User,Activity,2007-3,2007-4,Total time', lines.first
                 # Total row
                 assert_equal 'Total time,"","",154.25,8.65,162.90', lines.last
               end
               def test_csv_big_5
                 str_utf8  = "\xe4\xb8\x80\xe6\x9c\x88".force_encoding('UTF-8')
                 str_big5  = "\xa4@\xa4\xeb".force_encoding('Big5')
                 user = User.find_by_id(3)
                 user.firstname = str_utf8
                 user.lastname  = "test-lastname"
                 assert user.save
                 comments = "test_csv_big_5"
                 te1 = TimeEntry.create(:spent_on => '2011-11-11',
                                        :hours    => 7.3,
                                        :project  => Project.find(1),
                                        :user     => user,
                                        :activity => TimeEntryActivity.find_by_name('Design'),
                                        :comments => comments)
                 te2 = TimeEntry.find_by_comments(comments)
                 assert_not_nil te2
                 assert_equal 7.3, te2.hours
                 assert_equal 3, te2.user_id
                 with_settings :default_language => "zh-TW" do
                   get :report, :project_id => 1, :columns => 'day',
                       :from => "2011-11-11", :to => "2011-11-11",
                       :criteria => ["user"], :format => "csv"
                 end
                 assert_response :success
                 assert_equal 'text/csv; header=present', @response.content_type
                 lines = @response.body.chomp.split("\n")
                 # Headers
                 s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xa4u\xae\xc9\xc1`\xadp".force_encoding('Big5')
                 s2 = "\xa4u\xae\xc9\xc1`\xadp".force_encoding('Big5')
                 assert_equal s1, lines.first
                 # Total row
                 assert_equal "#{str_big5} #{user.lastname},7.30,7.30", lines[1]
                 assert_equal "#{s2},7.30,7.30", lines[2]
                 str_tw = "Traditional Chinese (\xe7\xb9\x81\xe9\xab\x94\xe4\xb8\xad\xe6\x96\x87)".force_encoding('UTF-8')
                 assert_equal str_tw, l(:general_lang_name)
                 assert_equal 'Big5', l(:general_csv_encoding)
                 assert_equal ',', l(:general_csv_separator)
                 assert_equal '.', l(:general_csv_decimal_separator)
               end
               def test_csv_cannot_convert_should_be_replaced_big_5
                 str_utf8  = "\xe4\xbb\xa5\xe5\x86\x85".force_encoding('UTF-8')
                 user = User.find_by_id(3)
                 user.firstname = str_utf8
                 user.lastname  = "test-lastname"
                 assert user.save
                 comments = "test_replaced"
                 te1 = TimeEntry.create(:spent_on => '2011-11-11',
                                        :hours    => 7.3,
                                        :project  => Project.find(1),
                                        :user     => user,
                                        :activity => TimeEntryActivity.find_by_name('Design'),
                                        :comments => comments)
                 te2 = TimeEntry.find_by_comments(comments)
                 assert_not_nil te2
                 assert_equal 7.3, te2.hours
                 assert_equal 3, te2.user_id
                 with_settings :default_language => "zh-TW" do
                   get :report, :project_id => 1, :columns => 'day',
                       :from => "2011-11-11", :to => "2011-11-11",
                       :criteria => ["user"], :format => "csv"
                 end
                 assert_response :success
                 assert_equal 'text/csv; header=present', @response.content_type
                 lines = @response.body.chomp.split("\n")
                 # Headers
                 s1 = "\xa5\xce\xa4\xe1,2011-11-11,\xa4u\xae\xc9\xc1`\xadp".force_encoding('Big5')
                 assert_equal s1, lines.first
                 # Total row
                 s2 = "\xa5H?".force_encoding('Big5')
                 assert_equal "#{s2} #{user.lastname},7.30,7.30", lines[1]
               end
               def test_csv_fr
                 with_settings :default_language => "fr" do
                   str1  = "test_csv_fr"
                   user = User.find_by_id(3)
                   te1 = TimeEntry.create(:spent_on => '2011-11-11',
                                          :hours    => 7.3,
                                          :project  => Project.find(1),
                                          :user     => user,
                                          :activity => TimeEntryActivity.find_by_name('Design'),
                                          :comments => str1)
                   te2 = TimeEntry.find_by_comments(str1)
                   assert_not_nil te2
                   assert_equal 7.3, te2.hours
                   assert_equal 3, te2.user_id
                   get :report, :project_id => 1, :columns => 'day',
                       :from => "2011-11-11", :to => "2011-11-11",
                       :criteria => ["user"], :format => "csv"
                   assert_response :success
                   assert_equal 'text/csv; header=present', @response.content_type
                   lines = @response.body.chomp.split("\n")
                   # Headers
                   s1 = "Utilisateur;2011-11-11;Temps total".force_encoding('ISO-8859-1')
                   s2 = "Temps total".force_encoding('ISO-8859-1')
                   assert_equal s1, lines.first
                   # Total row
                   assert_equal "#{user.firstname} #{user.lastname};7,30;7,30", lines[1]
                   assert_equal "#{s2};7,30;7,30", lines[2]
                   str_fr = "French (Fran\xc3\xa7ais)".force_encoding('UTF-8')
                   assert_equal str_fr, l(:general_lang_name)
                   assert_equal 'ISO-8859-1', l(:general_csv_encoding)
                   assert_equal ';', l(:general_csv_separator)
                   assert_equal ',', l(:general_csv_decimal_separator)
                 end
               end
             end

test/functional/timelog_controller_test.rb 0 -23

             # -*- coding: utf-8 -*-
             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class TimelogControllerTest < ActionController::TestCase
               fixtures :projects, :enabled_modules, :roles, :members,
                        :member_roles, :issues, :time_entries, :users,
                        :trackers, :enumerations, :issue_statuses,
                        :custom_fields, :custom_values,
                        :projects_trackers, :custom_fields_trackers,
                        :custom_fields_projects
               include Redmine::I18n
               def test_new
                 @request.session[:user_id] = 3
                 get :new
                 assert_response :success
                 assert_template 'new'
                 assert_select 'input[name=?][type=hidden]', 'project_id', 0
                 assert_select 'input[name=?][type=hidden]', 'issue_id', 0
                 assert_select 'select[name=?]', 'time_entry[project_id]' do
                   # blank option for project
                   assert_select 'option[value=""]'
                 end
               end
               def test_new_with_project_id
                 @request.session[:user_id] = 3
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'new'
                 assert_select 'input[name=?][type=hidden]', 'project_id'
                 assert_select 'input[name=?][type=hidden]', 'issue_id', 0
                 assert_select 'select[name=?]', 'time_entry[project_id]', 0
               end
               def test_new_with_issue_id
                 @request.session[:user_id] = 3
                 get :new, :issue_id => 2
                 assert_response :success
                 assert_template 'new'
                 assert_select 'input[name=?][type=hidden]', 'project_id', 0
                 assert_select 'input[name=?][type=hidden]', 'issue_id'
                 assert_select 'select[name=?]', 'time_entry[project_id]', 0
               end
               def test_new_without_project_should_prefill_the_form
                 @request.session[:user_id] = 3
                 get :new, :time_entry => {:project_id => '1'}
                 assert_response :success
                 assert_template 'new'
                 assert_select 'select[name=?]', 'time_entry[project_id]' do
                   assert_select 'option[value="1"][selected=selected]'
                 end
               end
               def test_new_without_project_should_deny_without_permission
                 Role.all.each {|role| role.remove_permission! :log_time}
                 @request.session[:user_id] = 3
                 get :new
                 assert_response 403
               end
               def test_new_should_select_default_activity
                 @request.session[:user_id] = 3
                 get :new, :project_id => 1
                 assert_response :success
                 assert_select 'select[name=?]', 'time_entry[activity_id]' do
                   assert_select 'option[selected=selected]', :text => 'Development'
                 end
               end
               def test_new_should_only_show_active_time_entry_activities
                 @request.session[:user_id] = 3
                 get :new, :project_id => 1
                 assert_response :success
                 assert_select 'option', :text => 'Inactive Activity', :count => 0
               end
               def test_post_new_as_js_should_update_activity_options
                 @request.session[:user_id] = 3
                 post :new, :time_entry => {:project_id => 1}, :format => 'js'
                 assert_response :success
                 assert_include '#time_entry_activity_id', response.body
               end
               def test_get_edit_existing_time
                 @request.session[:user_id] = 2
                 get :edit, :id => 2, :project_id => nil
                 assert_response :success
                 assert_template 'edit'
                 assert_select 'form[action=?]', '/time_entries/2'
               end
               def test_get_edit_with_an_existing_time_entry_with_inactive_activity
                 te = TimeEntry.find(1)
                 te.activity = TimeEntryActivity.find_by_name("Inactive Activity")
                 te.save!(:validate => false)
                 @request.session[:user_id] = 1
                 get :edit, :project_id => 1, :id => 1
                 assert_response :success
                 assert_template 'edit'
                 # Blank option since nothing is pre-selected
                 assert_select 'option', :text => '--- Please select ---'
               end
               def test_post_create
                 @request.session[:user_id] = 3
                 assert_difference 'TimeEntry.count' do
                   post :create, :project_id => 1,
                             :time_entry => {:comments => 'Some work on TimelogControllerTest',
                                             # Not the default activity
                                             :activity_id => '11',
                                             :spent_on => '2008-03-14',
                                             :issue_id => '1',
                                             :hours => '7.3'}
                   assert_redirected_to '/projects/ecookbook/time_entries'
                 end
                 t = TimeEntry.order('id DESC').first
                 assert_not_nil t
                 assert_equal 'Some work on TimelogControllerTest', t.comments
                 assert_equal 1, t.project_id
                 assert_equal 1, t.issue_id
                 assert_equal 11, t.activity_id
                 assert_equal 7.3, t.hours
                 assert_equal 3, t.user_id
               end
               def test_post_create_with_blank_issue
                 @request.session[:user_id] = 3
                 assert_difference 'TimeEntry.count' do
                   post :create, :project_id => 1,
                             :time_entry => {:comments => 'Some work on TimelogControllerTest',
                                             # Not the default activity
                                             :activity_id => '11',
                                             :issue_id => '',
                                             :spent_on => '2008-03-14',
                                             :hours => '7.3'}
                   assert_redirected_to '/projects/ecookbook/time_entries'
                 end
                 t = TimeEntry.order('id DESC').first
                 assert_not_nil t
                 assert_equal 'Some work on TimelogControllerTest', t.comments
                 assert_equal 1, t.project_id
                 assert_nil t.issue_id
                 assert_equal 11, t.activity_id
                 assert_equal 7.3, t.hours
                 assert_equal 3, t.user_id
               end
               def test_create_on_project_with_time_tracking_disabled_should_fail
                 Project.find(1).disable_module! :time_tracking
                 @request.session[:user_id] = 2
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :time_entry => {
                     :project_id => '1', :issue_id => '',
                     :activity_id => '11', :spent_on => '2008-03-14', :hours => '7.3'
                   }
                 end
               end
               def test_create_on_project_without_permission_should_fail
                 Role.find(1).remove_permission! :log_time
                 @request.session[:user_id] = 2
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :time_entry => {
                     :project_id => '1', :issue_id => '',
                     :activity_id => '11', :spent_on => '2008-03-14', :hours => '7.3'
                   }
                 end
               end
               def test_create_on_issue_in_project_with_time_tracking_disabled_should_fail
                 Project.find(1).disable_module! :time_tracking
                 @request.session[:user_id] = 2
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :time_entry => {
                     :project_id => '', :issue_id => '1',
                     :activity_id => '11', :spent_on => '2008-03-14', :hours => '7.3'
                   }
                   assert_select_error /Issue is invalid/
                 end
               end
               def test_create_on_issue_in_project_without_permission_should_fail
                 Role.find(1).remove_permission! :log_time
                 @request.session[:user_id] = 2
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :time_entry => {
                     :project_id => '', :issue_id => '1',
                     :activity_id => '11', :spent_on => '2008-03-14', :hours => '7.3'
                   }
                   assert_select_error /Issue is invalid/
                 end
               end
               def test_create_on_issue_that_is_not_visible_should_not_disclose_subject
                 issue = Issue.generate!(:subject => "issue_that_is_not_visible", :is_private => true)
                 assert !issue.visible?(User.find(3))
                 @request.session[:user_id] = 3
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :time_entry => {
                     :project_id => '', :issue_id => issue.id.to_s,
                     :activity_id => '11', :spent_on => '2008-03-14', :hours => '7.3'
                   }
                 end
                 assert_select_error /Issue is invalid/
                 assert_select "input[name=?][value=?]", "time_entry[issue_id]", issue.id.to_s
                 assert_select "#time_entry_issue", 0
                 assert !response.body.include?('issue_that_is_not_visible')
               end
               def test_create_and_continue_at_project_level
                 @request.session[:user_id] = 2
                 assert_difference 'TimeEntry.count' do
                   post :create, :time_entry => {:project_id => '1',
                                                 :activity_id => '11',
                                                 :issue_id => '',
                                                 :spent_on => '2008-03-14',
                                                 :hours => '7.3'},
                                 :continue => '1'
                   assert_redirected_to '/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=&time_entry%5Bproject_id%5D=1'
                 end
               end
               def test_create_and_continue_at_issue_level
                 @request.session[:user_id] = 2
                 assert_difference 'TimeEntry.count' do
                   post :create, :time_entry => {:project_id => '',
                                                 :activity_id => '11',
                                                 :issue_id => '1',
                                                 :spent_on => '2008-03-14',
                                                 :hours => '7.3'},
                                 :continue => '1'
                   assert_redirected_to '/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=1&time_entry%5Bproject_id%5D='
                 end
               end
               def test_create_and_continue_with_project_id
                 @request.session[:user_id] = 2
                 assert_difference 'TimeEntry.count' do
                   post :create, :project_id => 1,
                                 :time_entry => {:activity_id => '11',
                                                 :issue_id => '',
                                                 :spent_on => '2008-03-14',
                                                 :hours => '7.3'},
                                 :continue => '1'
                   assert_redirected_to '/projects/ecookbook/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=&time_entry%5Bproject_id%5D='
                 end
               end
               def test_create_and_continue_with_issue_id
                 @request.session[:user_id] = 2
                 assert_difference 'TimeEntry.count' do
                   post :create, :issue_id => 1,
                                 :time_entry => {:activity_id => '11',
                                                 :issue_id => '1',
                                                 :spent_on => '2008-03-14',
                                                 :hours => '7.3'},
                                 :continue => '1'
                   assert_redirected_to '/issues/1/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=1&time_entry%5Bproject_id%5D='
                 end
               end
               def test_create_without_log_time_permission_should_be_denied
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').remove_permission! :log_time
                 post :create, :project_id => 1,
                             :time_entry => {:activity_id => '11',
                                             :issue_id => '',
                                             :spent_on => '2008-03-14',
                                             :hours => '7.3'}
                 assert_response 403
               end
               def test_create_without_project_and_issue_should_fail
                 @request.session[:user_id] = 2
                 post :create, :time_entry => {:issue_id => ''}
                 assert_response :success
                 assert_template 'new'
               end
               def test_create_with_failure
                 @request.session[:user_id] = 2
                 post :create, :project_id => 1,
                             :time_entry => {:activity_id => '',
                                             :issue_id => '',
                                             :spent_on => '2008-03-14',
                                             :hours => '7.3'}
                 assert_response :success
                 assert_template 'new'
               end
               def test_create_without_project
                 @request.session[:user_id] = 2
                 assert_difference 'TimeEntry.count' do
                   post :create, :time_entry => {:project_id => '1',
                                               :activity_id => '11',
                                               :issue_id => '',
                                               :spent_on => '2008-03-14',
                                               :hours => '7.3'}
                 end
                 assert_redirected_to '/projects/ecookbook/time_entries'
                 time_entry = TimeEntry.order('id DESC').first
                 assert_equal 1, time_entry.project_id
               end
               def test_create_without_project_should_fail_with_issue_not_inside_project
                 @request.session[:user_id] = 2
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :time_entry => {:project_id => '1',
                                               :activity_id => '11',
                                               :issue_id => '5',
                                               :spent_on => '2008-03-14',
                                               :hours => '7.3'}
                 end
                 assert_response :success
                 assert assigns(:time_entry).errors[:issue_id].present?
               end
               def test_create_without_project_should_deny_without_permission
                 @request.session[:user_id] = 2
                 Project.find(3).disable_module!(:time_tracking)
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :time_entry => {:project_id => '3',
                                               :activity_id => '11',
                                               :issue_id => '',
                                               :spent_on => '2008-03-14',
                                               :hours => '7.3'}
                 end
                 assert_response 403
               end
               def test_create_without_project_with_failure
                 @request.session[:user_id] = 2
                 assert_no_difference 'TimeEntry.count' do
                   post :create, :time_entry => {:project_id => '1',
                                               :activity_id => '11',
                                               :issue_id => '',
                                               :spent_on => '2008-03-14',
                                               :hours => ''}
                 end
                 assert_response :success
                 assert_select 'select[name=?]', 'time_entry[project_id]' do
                   assert_select 'option[value="1"][selected=selected]'
                 end
               end
               def test_update
                 entry = TimeEntry.find(1)
                 assert_equal 1, entry.issue_id
                 assert_equal 2, entry.user_id
                 @request.session[:user_id] = 1
                 put :update, :id => 1,
                             :time_entry => {:issue_id => '2',
                                             :hours => '8'}
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 entry.reload
                 assert_equal 8, entry.hours
                 assert_equal 2, entry.issue_id
                 assert_equal 2, entry.user_id
               end
               def test_update_should_allow_to_change_issue_to_another_project
                 entry = TimeEntry.generate!(:issue_id => 1)
                 @request.session[:user_id] = 1
                 put :update, :id => entry.id, :time_entry => {:issue_id => '5'}
                 assert_response 302
                 entry.reload
                 assert_equal 5, entry.issue_id
                 assert_equal 3, entry.project_id
               end
               def test_update_should_not_allow_to_change_issue_to_an_invalid_project
                 entry = TimeEntry.generate!(:issue_id => 1)
                 Project.find(3).disable_module!(:time_tracking)
                 @request.session[:user_id] = 1
                 put :update, :id => entry.id, :time_entry => {:issue_id => '5'}
                 assert_response 200
                 assert_include "Issue is invalid", assigns(:time_entry).errors.full_messages
               end
               def test_get_bulk_edit
                 @request.session[:user_id] = 2
                 get :bulk_edit, :ids => [1, 2]
                 assert_response :success
                 assert_template 'bulk_edit'
                 assert_select 'ul#bulk-selection' do
                   assert_select 'li', 2
                   assert_select 'li a', :text => '03/23/2007 - eCookbook: 4.25 hours'
                 end
                 assert_select 'form#bulk_edit_form[action=?]', '/time_entries/bulk_update' do
                   # System wide custom field
                   assert_select 'select[name=?]', 'time_entry[custom_field_values][10]'
                   # Activities
                   assert_select 'select[name=?]', 'time_entry[activity_id]' do
                     assert_select 'option[value=""]', :text => '(No change)'
                     assert_select 'option[value="9"]', :text => 'Design'
                   end
                 end
               end
               def test_get_bulk_edit_on_different_projects
                 @request.session[:user_id] = 2
                 get :bulk_edit, :ids => [1, 2, 6]
                 assert_response :success
                 assert_template 'bulk_edit'
               end
               def test_bulk_edit_with_edit_own_time_entries_permission
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').remove_permission! :edit_time_entries
                 Role.find_by_name('Manager').add_permission! :edit_own_time_entries
                 ids = (0..1).map {TimeEntry.generate!(:user => User.find(2)).id}
                 get :bulk_edit, :ids => ids
                 assert_response :success
               end
               def test_bulk_update
                 @request.session[:user_id] = 2
                 # update time entry activity
                 post :bulk_update, :ids => [1, 2], :time_entry => { :activity_id => 9}
                 assert_response 302
                 # check that the issues were updated
                 assert_equal [9, 9], TimeEntry.where(:id => [1, 2]).collect {|i| i.activity_id}
               end
               def test_bulk_update_with_failure
                 @request.session[:user_id] = 2
                 post :bulk_update, :ids => [1, 2], :time_entry => { :hours => 'A'}
                 assert_response 302
                 assert_match /Failed to save 2 time entrie/, flash[:error]
               end
               def test_bulk_update_on_different_projects
                 @request.session[:user_id] = 2
                 # makes user a manager on the other project
                 Member.create!(:user_id => 2, :project_id => 3, :role_ids => [1])
                 # update time entry activity
                 post :bulk_update, :ids => [1, 2, 4], :time_entry => { :activity_id => 9 }
                 assert_response 302
                 # check that the issues were updated
                 assert_equal [9, 9, 9], TimeEntry.where(:id => [1, 2, 4]).collect {|i| i.activity_id}
               end
               def test_bulk_update_on_different_projects_without_rights
                 @request.session[:user_id] = 3
                 user = User.find(3)
                 action = { :controller => "timelog", :action => "bulk_update" }
                 assert user.allowed_to?(action, TimeEntry.find(1).project)
                 assert ! user.allowed_to?(action, TimeEntry.find(5).project)
                 post :bulk_update, :ids => [1, 5], :time_entry => { :activity_id => 9 }
                 assert_response 403
               end
               def test_bulk_update_with_edit_own_time_entries_permission
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').remove_permission! :edit_time_entries
                 Role.find_by_name('Manager').add_permission! :edit_own_time_entries
                 ids = (0..1).map {TimeEntry.generate!(:user => User.find(2)).id}
                 post :bulk_update, :ids => ids, :time_entry => { :activity_id => 9 }
                 assert_response 302
               end
               def test_bulk_update_with_edit_own_time_entries_permissions_should_be_denied_for_time_entries_of_other_user
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').remove_permission! :edit_time_entries
                 Role.find_by_name('Manager').add_permission! :edit_own_time_entries
                 post :bulk_update, :ids => [1, 2], :time_entry => { :activity_id => 9 }
                 assert_response 403
               end
               def test_bulk_update_custom_field
                 @request.session[:user_id] = 2
                 post :bulk_update, :ids => [1, 2], :time_entry => { :custom_field_values => {'10' => '0'} }
                 assert_response 302
                 assert_equal ["0", "0"], TimeEntry.where(:id => [1, 2]).collect {|i| i.custom_value_for(10).value}
               end
               def test_bulk_update_clear_custom_field
                 field = TimeEntryCustomField.generate!(:field_format => 'string')
                 @request.session[:user_id] = 2
                 post :bulk_update, :ids => [1, 2], :time_entry => { :custom_field_values => {field.id.to_s => '__none__'} }
                 assert_response 302
                 assert_equal ["", ""], TimeEntry.where(:id => [1, 2]).collect {|i| i.custom_value_for(field).value}
               end
               def test_post_bulk_update_should_redirect_back_using_the_back_url_parameter
                 @request.session[:user_id] = 2
                 post :bulk_update, :ids => [1,2], :back_url => '/time_entries'
                 assert_response :redirect
                 assert_redirected_to '/time_entries'
               end
               def test_post_bulk_update_should_not_redirect_back_using_the_back_url_parameter_off_the_host
                 @request.session[:user_id] = 2
                 post :bulk_update, :ids => [1,2], :back_url => 'http://google.com'
                 assert_response :redirect
                 assert_redirected_to :controller => 'timelog', :action => 'index', :project_id => Project.find(1).identifier
               end
               def test_post_bulk_update_without_edit_permission_should_be_denied
                 @request.session[:user_id] = 2
                 Role.find_by_name('Manager').remove_permission! :edit_time_entries
                 post :bulk_update, :ids => [1,2]
                 assert_response 403
               end
               def test_destroy
                 @request.session[:user_id] = 2
                 delete :destroy, :id => 1
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_equal I18n.t(:notice_successful_delete), flash[:notice]
                 assert_nil TimeEntry.find_by_id(1)
               end
               def test_destroy_should_fail
                 # simulate that this fails (e.g. due to a plugin), see #5700
                 TimeEntry.any_instance.expects(:destroy).returns(false)
                 @request.session[:user_id] = 2
                 delete :destroy, :id => 1
                 assert_redirected_to :action => 'index', :project_id => 'ecookbook'
                 assert_equal I18n.t(:notice_unable_delete_time_entry), flash[:error]
                 assert_not_nil TimeEntry.find_by_id(1)
               end
               def test_index_all_projects
                 get :index
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
                 assert_select 'form#query_form[action=?]', '/time_entries'
               end
               def test_index_all_projects_should_show_log_time_link
                 @request.session[:user_id] = 2
                 get :index
                 assert_response :success
                 assert_template 'index'
                 assert_select 'a[href=?]', '/time_entries/new', :text => /Log time/
               end
               def test_index_my_spent_time
                 @request.session[:user_id] = 2
                 get :index, :user_id => 'me'
                 assert_response :success
                 assert_template 'index'
                 assert assigns(:entries).all? {|entry| entry.user_id == 2}
               end
               def test_index_at_project_level
                 get :index, :project_id => 'ecookbook'
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:entries)
                 assert_equal 4, assigns(:entries).size
                 # project and subproject
                 assert_equal [1, 3], assigns(:entries).collect(&:project_id).uniq.sort
                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
                 assert_select 'form#query_form[action=?]', '/projects/ecookbook/time_entries'
               end
               def test_index_with_display_subprojects_issues_to_false_should_not_include_subproject_entries
                 entry = TimeEntry.generate!(:project => Project.find(3))
                 with_settings :display_subprojects_issues => '0' do
                   get :index, :project_id => 'ecookbook'
                   assert_response :success
                   assert_template 'index'
                   assert_not_include entry, assigns(:entries)
                 end
               end
               def test_index_with_display_subprojects_issues_to_false_and_subproject_filter_should_include_subproject_entries
                 entry = TimeEntry.generate!(:project => Project.find(3))
                 with_settings :display_subprojects_issues => '0' do
                   get :index, :project_id => 'ecookbook', :subproject_id => 3
                   assert_response :success
                   assert_template 'index'
                   assert_include entry, assigns(:entries)
                 end
               end
               def test_index_at_project_level_with_date_range
                 get :index, :project_id => 'ecookbook',
                   :f => ['spent_on'],
                   :op => {'spent_on' => '><'},
                   :v => {'spent_on' => ['2007-03-20', '2007-04-30']}
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:entries)
                 assert_equal 3, assigns(:entries).size
                 assert_not_nil assigns(:total_hours)
                 assert_equal "12.90", "%.2f" % assigns(:total_hours)
                 assert_select 'form#query_form[action=?]', '/projects/ecookbook/time_entries'
               end
               def test_index_at_project_level_with_date_range_using_from_and_to_params
                 get :index, :project_id => 'ecookbook', :from => '2007-03-20', :to => '2007-04-30'
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:entries)
                 assert_equal 3, assigns(:entries).size
                 assert_not_nil assigns(:total_hours)
                 assert_equal "12.90", "%.2f" % assigns(:total_hours)
                 assert_select 'form#query_form[action=?]', '/projects/ecookbook/time_entries'
               end
               def test_index_at_project_level_with_period
                 get :index, :project_id => 'ecookbook',
                   :f => ['spent_on'],
                   :op => {'spent_on' => '>t-'},
                   :v => {'spent_on' => ['7']}
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:entries)
                 assert_not_nil assigns(:total_hours)
                 assert_select 'form#query_form[action=?]', '/projects/ecookbook/time_entries'
               end
-              def test_index_at_issue_level
-                get :index, :issue_id => 1
-                assert_response :success
-                assert_template 'index'
-                assert_not_nil assigns(:entries)
-                assert_equal 2, assigns(:entries).size
-                assert_not_nil assigns(:total_hours)
-                assert_equal 154.25, assigns(:total_hours)
-                # display all time
-                assert_nil assigns(:from)
-                assert_nil assigns(:to)
-                assert_select 'form#query_form[action=?]', '/issues/1/time_entries'
-              end
               def test_index_should_sort_by_spent_on_and_created_on
                 t1 = TimeEntry.create!(:user => User.find(1), :project => Project.find(1), :hours => 1, :spent_on => '2012-06-16', :created_on => '2012-06-16 20:00:00', :activity_id => 10)
                 t2 = TimeEntry.create!(:user => User.find(1), :project => Project.find(1), :hours => 1, :spent_on => '2012-06-16', :created_on => '2012-06-16 20:05:00', :activity_id => 10)
                 t3 = TimeEntry.create!(:user => User.find(1), :project => Project.find(1), :hours => 1, :spent_on => '2012-06-15', :created_on => '2012-06-16 20:10:00', :activity_id => 10)
                 get :index, :project_id => 1,
                   :f => ['spent_on'],
                   :op => {'spent_on' => '><'},
                   :v => {'spent_on' => ['2012-06-15', '2012-06-16']}
                 assert_response :success
                 assert_equal [t2, t1, t3], assigns(:entries)
                 get :index, :project_id => 1,
                   :f => ['spent_on'],
                   :op => {'spent_on' => '><'},
                   :v => {'spent_on' => ['2012-06-15', '2012-06-16']},
                   :sort => 'spent_on'
                 assert_response :success
                 assert_equal [t3, t1, t2], assigns(:entries)
               end
               def test_index_with_filter_on_issue_custom_field
                 issue = Issue.generate!(:project_id => 1, :tracker_id => 1, :custom_field_values => {2 => 'filter_on_issue_custom_field'})
                 entry = TimeEntry.generate!(:issue => issue, :hours => 2.5)
                 get :index, :f => ['issue.cf_2'], :op => {'issue.cf_2' => '='}, :v => {'issue.cf_2' => ['filter_on_issue_custom_field']}
                 assert_response :success
                 assert_equal [entry], assigns(:entries)
               end
               def test_index_with_issue_custom_field_column
                 issue = Issue.generate!(:project_id => 1, :tracker_id => 1, :custom_field_values => {2 => 'filter_on_issue_custom_field'})
                 entry = TimeEntry.generate!(:issue => issue, :hours => 2.5)
                 get :index, :c => %w(project spent_on issue comments hours issue.cf_2)
                 assert_response :success
                 assert_include :'issue.cf_2', assigns(:query).column_names
                 assert_select 'td.issue_cf_2', :text => 'filter_on_issue_custom_field'
               end
               def test_index_with_time_entry_custom_field_column
                 field = TimeEntryCustomField.generate!(:field_format => 'string')
                 entry = TimeEntry.generate!(:hours => 2.5, :custom_field_values => {field.id => 'CF Value'})
                 field_name = "cf_#{field.id}"
                 get :index, :c => ["hours", field_name]
                 assert_response :success
                 assert_include field_name.to_sym, assigns(:query).column_names
                 assert_select "td.#{field_name}", :text => 'CF Value'
               end
               def test_index_with_time_entry_custom_field_sorting
                 field = TimeEntryCustomField.generate!(:field_format => 'string', :name => 'String Field')
                 TimeEntry.generate!(:hours => 2.5, :custom_field_values => {field.id => 'CF Value 1'})
                 TimeEntry.generate!(:hours => 2.5, :custom_field_values => {field.id => 'CF Value 3'})
                 TimeEntry.generate!(:hours => 2.5, :custom_field_values => {field.id => 'CF Value 2'})
                 field_name = "cf_#{field.id}"
                 get :index, :c => ["hours", field_name], :sort => field_name
                 assert_response :success
                 assert_include field_name.to_sym, assigns(:query).column_names
                 assert_select "th a.sort", :text => 'String Field'
                 # Make sure that values are properly sorted
                 values = assigns(:entries).map {|e| e.custom_field_value(field)}.compact
                 assert_equal 3, values.size
                 assert_equal values.sort, values
               end
               def test_index_with_query
                 query = TimeEntryQuery.new(:project_id => 1, :name => 'Time Entry Query', :visibility => 2)
                 query.save!
                 @request.session[:user_id] = 2
                 get :index, :project_id => 'ecookbook', :query_id => query.id
                 assert_response :success
                 assert_select 'h2', :text => query.name
                 assert_select '#sidebar a.selected', :text => query.name
               end
               def test_index_atom_feed
                 get :index, :project_id => 1, :format => 'atom'
                 assert_response :success
                 assert_equal 'application/atom+xml', @response.content_type
                 assert_not_nil assigns(:items)
                 assert assigns(:items).first.is_a?(TimeEntry)
               end
               def test_index_at_project_level_should_include_csv_export_dialog
                 get :index, :project_id => 'ecookbook',
                   :f => ['spent_on'],
                   :op => {'spent_on' => '>='},
                   :v => {'spent_on' => ['2007-04-01']},
                   :c => ['spent_on', 'user']
                 assert_response :success
                 assert_select '#csv-export-options' do
                   assert_select 'form[action=?][method=get]', '/projects/ecookbook/time_entries.csv' do
                     # filter
                     assert_select 'input[name=?][value=?]', 'f[]', 'spent_on'
                     assert_select 'input[name=?][value=?]', 'op[spent_on]', '>='
                     assert_select 'input[name=?][value=?]', 'v[spent_on][]', '2007-04-01'
                     # columns
                     assert_select 'input[name=?][value=?]', 'c[]', 'spent_on'
                     assert_select 'input[name=?][value=?]', 'c[]', 'user'
                     assert_select 'input[name=?]', 'c[]', 2
                   end
                 end
               end
               def test_index_cross_project_should_include_csv_export_dialog
                 get :index
                 assert_response :success
                 assert_select '#csv-export-options' do
                   assert_select 'form[action=?][method=get]', '/time_entries.csv'
                 end
               end
-              def test_index_at_issue_level_should_include_csv_export_dialog
-                get :index, :issue_id => 3
-                assert_response :success
-                assert_select '#csv-export-options' do
-                  assert_select 'form[action=?][method=get]', '/issues/3/time_entries.csv'
-                end
-              end
               def test_index_csv_all_projects
                 with_settings :date_format => '%m/%d/%Y' do
                   get :index, :format => 'csv'
                   assert_response :success
                   assert_equal 'text/csv; header=present', response.content_type
                 end
               end
               def test_index_csv
                 with_settings :date_format => '%m/%d/%Y' do
                   get :index, :project_id => 1, :format => 'csv'
                   assert_response :success
                   assert_equal 'text/csv; header=present', response.content_type
                 end
               end
               def test_index_csv_should_fill_issue_column_with_tracker_id_and_subject
                 issue = Issue.find(1)
                 entry = TimeEntry.generate!(:issue => issue, :comments => "Issue column content test")
                 get :index, :format => 'csv'
                 line = response.body.split("\n").detect {|l| l.include?(entry.comments)}
                 assert_not_nil line
                 assert_include "#{issue.tracker} #1: #{issue.subject}", line
               end
             end

test/integration/routing/timelog_test.rb +1 -7

             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../../test_helper', __FILE__)
             class RoutingTimelogsTest < Redmine::RoutingTest
               def test_timelogs_global
                 should_route 'GET /time_entries' => 'timelog#index'
                 should_route 'GET /time_entries.csv' => 'timelog#index', :format => 'csv'
                 should_route 'GET /time_entries.atom' => 'timelog#index', :format => 'atom'
                 should_route 'GET /time_entries/new' => 'timelog#new'
                 should_route 'POST /time_entries/new' => 'timelog#new'
                 should_route 'POST /time_entries' => 'timelog#create'
                 should_route 'GET /time_entries/22/edit' => 'timelog#edit', :id => '22'
                 should_route 'PUT /time_entries/22' => 'timelog#update', :id => '22'
                 should_route 'DELETE /time_entries/22' => 'timelog#destroy', :id => '22'
               end
               def test_timelogs_scoped_under_project
                 should_route 'GET /projects/foo/time_entries' => 'timelog#index', :project_id => 'foo'
                 should_route 'GET /projects/foo/time_entries.csv' => 'timelog#index', :project_id => 'foo', :format => 'csv'
                 should_route 'GET /projects/foo/time_entries.atom' => 'timelog#index', :project_id => 'foo', :format => 'atom'
                 should_route 'GET /projects/foo/time_entries/new' => 'timelog#new', :project_id => 'foo'
                 should_route 'POST /projects/foo/time_entries' => 'timelog#create', :project_id => 'foo'
               end
               def test_timelogs_scoped_under_issues
-                should_route 'GET /issues/234/time_entries' => 'timelog#index', :issue_id => '234'
+                should_route 'GET  /issues/234/time_entries/new' => 'timelog#new', :issue_id => '234'
-                should_route 'GET /issues/234/time_entries.csv' => 'timelog#index', :issue_id => '234', :format => 'csv'
-                should_route 'GET /issues/234/time_entries.atom' => 'timelog#index', :issue_id => '234', :format => 'atom'
-                should_route 'GET /issues/234/time_entries/new' => 'timelog#new', :issue_id => '234'
                 should_route 'POST /issues/234/time_entries' => 'timelog#create', :issue_id => '234'
               end
               def test_timelogs_report
                 should_route 'GET /time_entries/report' => 'timelog#report'
                 should_route 'GET /time_entries/report.csv' => 'timelog#report', :format => 'csv'
                 should_route 'GET /projects/foo/time_entries/report' => 'timelog#report', :project_id => 'foo'
                 should_route 'GET /projects/foo/time_entries/report.csv' => 'timelog#report', :project_id => 'foo', :format => 'csv'
-                should_route 'GET /issues/234/time_entries/report' => 'timelog#report', :issue_id => '234'
-                should_route 'GET /issues/234/time_entries/report.csv' => 'timelog#report', :issue_id => '234', :format => 'csv'
               end
               def test_timelogs_bulk_edit
                 should_route 'GET /time_entries/bulk_edit' => 'timelog#bulk_edit'
                 should_route 'POST /time_entries/bulk_update' => 'timelog#bulk_update'
                 should_route 'DELETE /time_entries/destroy' => 'timelog#destroy'
               end
             end

test/unit/helpers/routes_helper_test.rb 0 -4

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2016  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../../test_helper', __FILE__)
             class RoutesHelperTest < ActionView::TestCase
               fixtures :projects, :issues
               include Rails.application.routes.url_helpers
               def test_time_entries_path
                 assert_equal '/projects/ecookbook/time_entries', _time_entries_path(Project.find(1), nil)
-                assert_equal '/issues/1/time_entries', _time_entries_path(Project.find(1), Issue.find(1))
-                assert_equal '/issues/1/time_entries', _time_entries_path(nil, Issue.find(1))
                 assert_equal '/time_entries', _time_entries_path(nil, nil)
               end
               def test_report_time_entries_path
                 assert_equal '/projects/ecookbook/time_entries/report', _report_time_entries_path(Project.find(1), nil)
-                assert_equal '/issues/1/time_entries/report', _report_time_entries_path(Project.find(1), Issue.find(1))
-                assert_equal '/issues/1/time_entries/report', _report_time_entries_path(nil, Issue.find(1))
                 assert_equal '/time_entries/report', _report_time_entries_path(nil, nil)
               end
               def test_new_time_entry_path
                 assert_equal '/projects/ecookbook/time_entries/new', _new_time_entry_path(Project.find(1), nil)
                 assert_equal '/issues/1/time_entries/new', _new_time_entry_path(Project.find(1), Issue.find(1))
                 assert_equal '/issues/1/time_entries/new', _new_time_entry_path(nil, Issue.find(1))
                 assert_equal '/time_entries/new', _new_time_entry_path(nil, nil)
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages