jro_apps/redmine Commit - r13058:15d5c331ebc1

Let the new time_entry form be submitted without project (#17954)....

Jean-Philippe Lang -

r13058:15d5c331ebc1

parent child

Context file:

r13058:15d5c331ebc1

Collapse all files

app/controllers/timelog_controller.rb +19 -36

             # Redmine - project management software
             # Copyright (C) 2006-2014  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_project_for_new_time_entry, :only => [:create]
               before_filter :find_time_entry, :only => [:show, :edit, :update]
               before_filter :find_time_entries, :only => [:bulk_edit, :bulk_update, :destroy]
-              before_filter :authorize, :except => [:new, :index, :report]
+              before_filter :authorize, :only => [:show, :edit, :update, :bulk_edit, :bulk_update, :destroy]
-              before_filter :find_optional_project, :only => [:index, :report]
+              before_filter :find_optional_project, :only => [:new, :create, :index, :report]
-              before_filter :find_optional_project_for_new_time_entry, :only => [:new]
+              before_filter :authorize_global, :only => [:new, :create, :index, :report]
-              before_filter :authorize_global, :only => [:new, :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
                 @query = TimeEntryQuery.build_from_params(params, :project => @project, :name => '_')
                 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).all
                     @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).all
                   }
                   format.atom {
                     entries = scope.limit(Setting.feeds_limit.to_i).reorder("#{TimeEntry.table_name}.created_on DESC").all
                     render_feed(entries, :title => l(:label_spent_time))
                   }
                   format.csv {
                     # Export all entries
                     @entries = scope.all
                     send_data(query_to_csv(@entries, @query, params), :type => 'text/csv; header=present', :filename => 'timelog.csv')
                   }
                 end
               end
               def report
                 @query = TimeEntryQuery.build_from_params(params, :project => @project, :name => '_')
                 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]
-                        if params[:project_id]
                         options = {
-                            :time_entry => {:issue_id => @time_entry.issue_id, :activity_id => @time_entry.activity_id},
+                          :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 @time_entry.issue
+                        if params[:project_id] && @time_entry.project
-                            redirect_to new_project_issue_time_entry_path(@time_entry.project, @time_entry.issue, options)
-                          else
                           redirect_to new_project_time_entry_path(@time_entry.project, options)
-                          end
+                        elsif params[:issue_id] && @time_entry.issue
+                          redirect_to new_issue_time_entry_path(@time_entry.issue, options)
                         else
-                          options = {
-                            :time_entry => {:project_id => @time_entry.project_id, :issue_id => @time_entry.issue_id, :activity_id => @time_entry.activity_id},
-                            :back_url => params[:back_url]
                           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_time_entry_attributes(params)
                 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]).all
                 raise ActiveRecord::RecordNotFound if @time_entries.empty?
                 @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_for_new_time_entry
-                if (project_id = (params[:project_id] || params[:time_entry] && params[:time_entry][:project_id])).present?
-                  @project = Project.find(project_id)
-                end
-                if (issue_id = (params[:issue_id] || params[:time_entry] && params[:time_entry][:issue_id])).present?
-                  @issue = Issue.find(issue_id)
-                  @project ||= @issue.project
-                end
-              rescue ActiveRecord::RecordNotFound
-                render_404
-              end
-              def find_project_for_new_time_entry
-                find_optional_project_for_new_time_entry
-                if @project.nil?
-                  render_404
-                end
-              end
               def find_optional_project
-                if !params[:issue_id].blank?
+                if params[:issue_id].present?
                   @issue = Issue.find(params[:issue_id])
                   @project = @issue.project
-                elsif !params[:project_id].blank?
+                elsif 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)
                 if @issue
                   scope = scope.on_issue(@issue)
                 end
                 scope
               end
               def parse_params_for_bulk_time_entry_attributes(params)
                 attributes = (params[:time_entry] || {}).reject {|k,v| v.blank?}
                 attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
                 attributes[:custom_field_values].reject! {|k,v| v.blank?} if attributes[:custom_field_values]
                 attributes
               end
             end

app/helpers/application_helper.rb +4 -1

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2014  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 'forwardable'
             require 'cgi'
             module ApplicationHelper
               include Redmine::WikiFormatting::Macros::Definitions
               include Redmine::I18n
               include GravatarHelper::PublicMethods
               include Redmine::Pagination::Helper
               extend Forwardable
               def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
               # Return true if user is authorized for controller/action, otherwise false
               def authorize_for(controller, action)
                 User.current.allowed_to?({:controller => controller, :action => action}, @project)
               end
               # Display a link if user is authorized
               #
               # @param [String] name Anchor text (passed to link_to)
               # @param [Hash] options Hash params. This will checked by authorize_for to see if the user is authorized
               # @param [optional, Hash] html_options Options passed to link_to
               # @param [optional, Hash] parameters_for_method_reference Extra parameters for link_to
               def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
                 link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
               end
               # Displays a link to user's account page if active
               def link_to_user(user, options={})
                 if user.is_a?(User)
                   name = h(user.name(options[:format]))
                   if user.active? || (User.current.admin? && user.logged?)
                     link_to name, user_path(user), :class => user.css_classes
                   else
                     name
                   end
                 else
                   h(user.to_s)
                 end
               end
               # Displays a link to +issue+ with its subject.
               # Examples:
               #
               #   link_to_issue(issue)                        # => Defect #6: This is the subject
               #   link_to_issue(issue, :truncate => 6)        # => Defect #6: This i...
               #   link_to_issue(issue, :subject => false)     # => Defect #6
               #   link_to_issue(issue, :project => true)      # => Foo - Defect #6
               #   link_to_issue(issue, :subject => false, :tracker => false)     # => #6
               #
               def link_to_issue(issue, options={})
                 title = nil
                 subject = nil
                 text = options[:tracker] == false ? "##{issue.id}" : "#{issue.tracker} ##{issue.id}"
                 if options[:subject] == false
                   title = issue.subject.truncate(60)
                 else
                   subject = issue.subject
                   if truncate_length = options[:truncate]
                     subject = subject.truncate(truncate_length)
                   end
                 end
                 only_path = options[:only_path].nil? ? true : options[:only_path]
                 s = link_to(text, issue_path(issue, :only_path => only_path),
                             :class => issue.css_classes, :title => title)
                 s << h(": #{subject}") if subject
                 s = h("#{issue.project} - ") + s if options[:project]
                 s
               end
               # Generates a link to an attachment.
               # Options:
               # * :text - Link text (default to attachment filename)
               # * :download - Force download (default: false)
               def link_to_attachment(attachment, options={})
                 text = options.delete(:text) || attachment.filename
                 route_method = options.delete(:download) ? :download_named_attachment_path : :named_attachment_path
                 html_options = options.slice!(:only_path)
                 url = send(route_method, attachment, attachment.filename, options)
                 link_to text, url, html_options
               end
               # Generates a link to a SCM revision
               # Options:
               # * :text - Link text (default to the formatted revision)
               def link_to_revision(revision, repository, options={})
                 if repository.is_a?(Project)
                   repository = repository.repository
                 end
                 text = options.delete(:text) || format_revision(revision)
                 rev = revision.respond_to?(:identifier) ? revision.identifier : revision
                 link_to(
                     h(text),
                     {:controller => 'repositories', :action => 'revision', :id => repository.project, :repository_id => repository.identifier_param, :rev => rev},
                     :title => l(:label_revision_id, format_revision(revision))
                   )
               end
               # Generates a link to a message
               def link_to_message(message, options={}, html_options = nil)
                 link_to(
                   message.subject.truncate(60),
                   board_message_path(message.board_id, message.parent_id || message.id, {
                     :r => (message.parent_id && message.id),
                     :anchor => (message.parent_id ? "message-#{message.id}" : nil)
                   }.merge(options)),
                   html_options
                 )
               end
               # Generates a link to a project if active
               # Examples:
               #
               #   link_to_project(project)                          # => link to the specified project overview
               #   link_to_project(project, {:only_path => false}, :class => "project") # => 3rd arg adds html options
               #   link_to_project(project, {}, :class => "project") # => html options with default url (project overview)
               #
               def link_to_project(project, options={}, html_options = nil)
                 if project.archived?
                   h(project.name)
                 elsif options.key?(:action)
                   ActiveSupport::Deprecation.warn "#link_to_project with :action option is deprecated and will be removed in Redmine 3.0."
                   url = {:controller => 'projects', :action => 'show', :id => project}.merge(options)
                   link_to project.name, url, html_options
                 else
                   link_to project.name, project_path(project, options), html_options
                 end
               end
               # Generates a link to a project settings if active
               def link_to_project_settings(project, options={}, html_options=nil)
                 if project.active?
                   link_to project.name, settings_project_path(project, options), html_options
                 elsif project.archived?
                   h(project.name)
                 else
                   link_to project.name, project_path(project, options), html_options
                 end
               end
               # Generates a link to a version
               def link_to_version(version, options = {})
                 return '' unless version && version.is_a?(Version)
                 options = {:title => format_date(version.effective_date)}.merge(options)
                 link_to_if version.visible?, format_version_name(version), version_path(version), options
               end
               # Helper that formats object for html or text rendering
               def format_object(object, html=true, &block)
                 if block_given?
                   object = yield object
                 end
                 case object.class.name
                 when 'Array'
                   object.map {|o| format_object(o, html)}.join(', ').html_safe
                 when 'Time'
                   format_time(object)
                 when 'Date'
                   format_date(object)
                 when 'Fixnum'
                   object.to_s
                 when 'Float'
                   sprintf "%.2f", object
                 when 'User'
                   html ? link_to_user(object) : object.to_s
                 when 'Project'
                   html ? link_to_project(object) : object.to_s
                 when 'Version'
                   html ? link_to_version(object) : object.to_s
                 when 'TrueClass'
                   l(:general_text_Yes)
                 when 'FalseClass'
                   l(:general_text_No)
                 when 'Issue'
                   object.visible? && html ? link_to_issue(object) : "##{object.id}"
                 when 'CustomValue', 'CustomFieldValue'
                   if object.custom_field
                     f = object.custom_field.format.formatted_custom_value(self, object, html)
                     if f.nil? || f.is_a?(String)
                       f
                     else
                       format_object(f, html, &block)
                     end
                   else
                     object.value.to_s
                   end
                 else
                   html ? h(object) : object.to_s
                 end
               end
               def wiki_page_path(page, options={})
                 url_for({:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title}.merge(options))
               end
               def thumbnail_tag(attachment)
                 link_to image_tag(thumbnail_path(attachment)),
                   named_attachment_path(attachment, attachment.filename),
                   :title => attachment.filename
               end
               def toggle_link(name, id, options={})
                 onclick = "$('##{id}').toggle(); "
                 onclick << (options[:focus] ? "$('##{options[:focus]}').focus(); " : "this.blur(); ")
                 onclick << "return false;"
                 link_to(name, "#", :onclick => onclick)
               end
               def image_to_function(name, function, html_options = {})
                 html_options.symbolize_keys!
                 tag(:input, html_options.merge({
                     :type => "image", :src => image_path(name),
                     :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};"
                     }))
               end
               def format_activity_title(text)
                 h(truncate_single_line_raw(text, 100))
               end
               def format_activity_day(date)
                 date == User.current.today ? l(:label_today).titleize : format_date(date)
               end
               def format_activity_description(text)
                 h(text.to_s.truncate(120).gsub(%r{[\r\n]*<(pre|code)>.*$}m, '...')
                    ).gsub(/[\r\n]+/, "<br />").html_safe
               end
               def format_version_name(version)
                 if !version.shared? || version.project == @project
                   h(version)
                 else
                   h("#{version.project} - #{version}")
                 end
               end
               def due_date_distance_in_words(date)
                 if date
                   l((date < Date.today ? :label_roadmap_overdue : :label_roadmap_due_in), distance_of_date_in_words(Date.today, date))
                 end
               end
               # Renders a tree of projects as a nested set of unordered lists
               # The given collection may be a subset of the whole project tree
               # (eg. some intermediate nodes are private and can not be seen)
               def render_project_nested_lists(projects)
                 s = ''
                 if projects.any?
                   ancestors = []
                   original_project = @project
                   projects.sort_by(&:lft).each do |project|
                     # set the project environment to please macros.
                     @project = project
                     if (ancestors.empty? || project.is_descendant_of?(ancestors.last))
                       s << "<ul class='projects #{ ancestors.empty? ? 'root' : nil}'>\n"
                     else
                       ancestors.pop
                       s << "</li>"
                       while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
                         ancestors.pop
                         s << "</ul></li>\n"
                       end
                     end
                     classes = (ancestors.empty? ? 'root' : 'child')
                     s << "<li class='#{classes}'><div class='#{classes}'>"
                     s << h(block_given? ? yield(project) : project.name)
                     s << "</div>\n"
                     ancestors << project
                   end
                   s << ("</li></ul>\n" * ancestors.size)
                   @project = original_project
                 end
                 s.html_safe
               end
               def render_page_hierarchy(pages, node=nil, options={})
                 content = ''
                 if pages[node]
                   content << "<ul class=\"pages-hierarchy\">\n"
                   pages[node].each do |page|
                     content << "<li>"
                     content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title, :version => nil},
                                        :title => (options[:timestamp] && page.updated_on ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
                     content << "\n" + render_page_hierarchy(pages, page.id, options) if pages[page.id]
                     content << "</li>\n"
                   end
                   content << "</ul>\n"
                 end
                 content.html_safe
               end
               # Renders flash messages
               def render_flash_messages
                 s = ''
                 flash.each do |k,v|
                   s << content_tag('div', v.html_safe, :class => "flash #{k}", :id => "flash_#{k}")
                 end
                 s.html_safe
               end
               # Renders tabs and their content
               def render_tabs(tabs, selected=params[:tab])
                 if tabs.any?
                   unless tabs.detect {|tab| tab[:name] == selected}
                     selected = nil
                   end
                   selected ||= tabs.first[:name]
                   render :partial => 'common/tabs', :locals => {:tabs => tabs, :selected_tab => selected}
                 else
                   content_tag 'p', l(:label_no_data), :class => "nodata"
                 end
               end
               # Renders the project quick-jump box
               def render_project_jump_box
                 return unless User.current.logged?
                 projects = User.current.memberships.collect(&:project).compact.select(&:active?).uniq
                 if projects.any?
                   options =
                     ("<option value=''>#{ l(:label_jump_to_a_project) }</option>" +
                      '<option value="" disabled="disabled">---</option>').html_safe
                   options << project_tree_options_for_select(projects, :selected => @project) do |p|
                     { :value => project_path(:id => p, :jump => current_menu_item) }
                   end
                   select_tag('project_quick_jump_box', options, :onchange => 'if (this.value != \'\') { window.location = this.value; }')
                 end
               end
               def project_tree_options_for_select(projects, options = {})
-                s = ''
+                s = ''.html_safe
+                if options[:include_blank]
+                  s << content_tag('option', '&nbsp;'.html_safe, :value => '')
+                end
                 project_tree(projects) do |project, level|
                   name_prefix = (level > 0 ? '&nbsp;' * 2 * level + '&#187; ' : '').html_safe
                   tag_options = {:value => project.id}
                   if project == options[:selected] || (options[:selected].respond_to?(:include?) && options[:selected].include?(project))
                     tag_options[:selected] = 'selected'
                   else
                     tag_options[:selected] = nil
                   end
                   tag_options.merge!(yield(project)) if block_given?
                   s << content_tag('option', name_prefix + h(project), tag_options)
                 end
                 s.html_safe
               end
               # Yields the given block for each project with its level in the tree
               #
               # Wrapper for Project#project_tree
               def project_tree(projects, &block)
                 Project.project_tree(projects, &block)
               end
               def principals_check_box_tags(name, principals)
                 s = ''
                 principals.each do |principal|
                   s << "<label>#{ check_box_tag name, principal.id, false, :id => nil } #{h principal}</label>\n"
                 end
                 s.html_safe
               end
               # Returns a string for users/groups option tags
               def principals_options_for_select(collection, selected=nil)
                 s = ''
                 if collection.include?(User.current)
                   s << content_tag('option', "<< #{l(:label_me)} >>", :value => User.current.id)
                 end
                 groups = ''
                 collection.sort.each do |element|
                   selected_attribute = ' selected="selected"' if option_value_selected?(element, selected) || element.id.to_s == selected
                   (element.is_a?(Group) ? groups : s) << %(<option value="#{element.id}"#{selected_attribute}>#{h element.name}</option>)
                 end
                 unless groups.empty?
                   s << %(<optgroup label="#{h(l(:label_group_plural))}">#{groups}</optgroup>)
                 end
                 s.html_safe
               end
               # Options for the new membership projects combo-box
               def options_for_membership_project_select(principal, projects)
                 options = content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---")
                 options << project_tree_options_for_select(projects) do |p|
                   {:disabled => principal.projects.to_a.include?(p)}
                 end
                 options
               end
               def option_tag(name, text, value, selected=nil, options={})
                 content_tag 'option', value, options.merge(:value => value, :selected => (value == selected))
               end
               # Truncates and returns the string as a single line
               def truncate_single_line(string, *args)
                 ActiveSupport::Deprecation.warn(
                   "ApplicationHelper#truncate_single_line is deprecated and will be removed in Rails 4 poring")
                 # Rails 4 ActionView::Helpers::TextHelper#truncate escapes.
                 # So, result is broken.
                 truncate(string.to_s, *args).gsub(%r{[\r\n]+}m, ' ')
               end
               def truncate_single_line_raw(string, length)
                 string.truncate(length).gsub(%r{[\r\n]+}m, ' ')
               end
               # Truncates at line break after 250 characters or options[:length]
               def truncate_lines(string, options={})
                 length = options[:length] || 250
                 if string.to_s =~ /\A(.{#{length}}.*?)$/m
                   "#{$1}..."
                 else
                   string
                 end
               end
               def anchor(text)
                 text.to_s.gsub(' ', '_')
               end
               def html_hours(text)
                 text.gsub(%r{(\d+)\.(\d+)}, '<span class="hours hours-int">\1</span><span class="hours hours-dec">.\2</span>').html_safe
               end
               def authoring(created, author, options={})
                 l(options[:label] || :label_added_time_by, :author => link_to_user(author), :age => time_tag(created)).html_safe
               end
               def time_tag(time)
                 text = distance_of_time_in_words(Time.now, time)
                 if @project
                   link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => User.current.time_to_date(time)}, :title => format_time(time))
                 else
                   content_tag('abbr', text, :title => format_time(time))
                 end
               end
               def syntax_highlight_lines(name, content)
                 lines = []
                 syntax_highlight(name, content).each_line { |line| lines << line }
                 lines
               end
               def syntax_highlight(name, content)
                 Redmine::SyntaxHighlighting.highlight_by_filename(content, name)
               end
               def to_path_param(path)
                 str = path.to_s.split(%r{[/\\]}).select{|p| !p.blank?}.join("/")
                 str.blank? ? nil : str
               end
               def reorder_links(name, url, method = :post)
                 link_to(image_tag('2uparrow.png', :alt => l(:label_sort_highest)),
                         url.merge({"#{name}[move_to]" => 'highest'}),
                         :method => method, :title => l(:label_sort_highest)) +
                 link_to(image_tag('1uparrow.png',   :alt => l(:label_sort_higher)),
                         url.merge({"#{name}[move_to]" => 'higher'}),
                        :method => method, :title => l(:label_sort_higher)) +
                 link_to(image_tag('1downarrow.png', :alt => l(:label_sort_lower)),
                         url.merge({"#{name}[move_to]" => 'lower'}),
                         :method => method, :title => l(:label_sort_lower)) +
                 link_to(image_tag('2downarrow.png', :alt => l(:label_sort_lowest)),
                         url.merge({"#{name}[move_to]" => 'lowest'}),
                        :method => method, :title => l(:label_sort_lowest))
               end
               def breadcrumb(*args)
                 elements = args.flatten
                 elements.any? ? content_tag('p', (args.join(" \xc2\xbb ") + " \xc2\xbb ").html_safe, :class => 'breadcrumb') : nil
               end
               def other_formats_links(&block)
                 concat('<p class="other-formats">'.html_safe + l(:label_export_to))
                 yield Redmine::Views::OtherFormatsBuilder.new(self)
                 concat('</p>'.html_safe)
               end
               def page_header_title
                 if @project.nil? || @project.new_record?
                   h(Setting.app_title)
                 else
                   b = []
                   ancestors = (@project.root? ? [] : @project.ancestors.visible.all)
                   if ancestors.any?
                     root = ancestors.shift
                     b << link_to_project(root, {:jump => current_menu_item}, :class => 'root')
                     if ancestors.size > 2
                       b << "\xe2\x80\xa6"
                       ancestors = ancestors[-2, 2]
                     end
                     b += ancestors.collect {|p| link_to_project(p, {:jump => current_menu_item}, :class => 'ancestor') }
                   end
                   b << h(@project)
                   b.join(" \xc2\xbb ").html_safe
                 end
               end
               # Returns a h2 tag and sets the html title with the given arguments
               def title(*args)
                 strings = args.map do |arg|
                   if arg.is_a?(Array) && arg.size >= 2
                     link_to(*arg)
                   else
                     h(arg.to_s)
                   end
                 end
                 html_title args.reverse.map {|s| (s.is_a?(Array) ? s.first : s).to_s}
                 content_tag('h2', strings.join(' &#187; ').html_safe)
               end
               # Sets the html title
               # Returns the html title when called without arguments
               # Current project name and app_title and automatically appended
               # Exemples:
               #   html_title 'Foo', 'Bar'
               #   html_title # => 'Foo - Bar - My Project - Redmine'
               def html_title(*args)
                 if args.empty?
                   title = @html_title || []
                   title << @project.name if @project
                   title << Setting.app_title unless Setting.app_title == title.last
                   title.reject(&:blank?).join(' - ')
                 else
                   @html_title ||= []
                   @html_title += args
                 end
               end
               # Returns the theme, controller name, and action as css classes for the
               # HTML body.
               def body_css_classes
                 css = []
                 if theme = Redmine::Themes.theme(Setting.ui_theme)
                   css << 'theme-' + theme.name
                 end
                 css << 'project-' + @project.identifier if @project && @project.identifier.present?
                 css << 'controller-' + controller_name
                 css << 'action-' + action_name
                 css.join(' ')
               end
               def accesskey(s)
                 @used_accesskeys ||= []
                 key = Redmine::AccessKeys.key_for(s)
                 return nil if @used_accesskeys.include?(key)
                 @used_accesskeys << key
                 key
               end
               # Formats text according to system settings.
               # 2 ways to call this method:
               # * with a String: textilizable(text, options)
               # * with an object and one of its attribute: textilizable(issue, :description, options)
               def textilizable(*args)
                 options = args.last.is_a?(Hash) ? args.pop : {}
                 case args.size
                 when 1
                   obj = options[:object]
                   text = args.shift
                 when 2
                   obj = args.shift
                   attr = args.shift
                   text = obj.send(attr).to_s
                 else
                   raise ArgumentError, 'invalid arguments to textilizable'
                 end
                 return '' if text.blank?
                 project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
                 only_path = options.delete(:only_path) == false ? false : true
                 text = text.dup
                 macros = catch_macros(text)
                 text = Redmine::WikiFormatting.to_html(Setting.text_formatting, text, :object => obj, :attribute => attr)
                 @parsed_headings = []
                 @heading_anchors = {}
                 @current_section = 0 if options[:edit_section_links]
                 parse_sections(text, project, obj, attr, only_path, options)
                 text = parse_non_pre_blocks(text, obj, macros) do |text|
                   [:parse_inline_attachments, :parse_wiki_links, :parse_redmine_links].each do |method_name|
                     send method_name, text, project, obj, attr, only_path, options
                   end
                 end
                 parse_headings(text, project, obj, attr, only_path, options)
                 if @parsed_headings.any?
                   replace_toc(text, @parsed_headings)
                 end
                 text.html_safe
               end
               def parse_non_pre_blocks(text, obj, macros)
                 s = StringScanner.new(text)
                 tags = []
                 parsed = ''
                 while !s.eos?
                   s.scan(/(.*?)(<(\/)?(pre|code)(.*?)>|\z)/im)
                   text, full_tag, closing, tag = s[1], s[2], s[3], s[4]
                   if tags.empty?
                     yield text
                     inject_macros(text, obj, macros) if macros.any?
                   else
                     inject_macros(text, obj, macros, false) if macros.any?
                   end
                   parsed << text
                   if tag
                     if closing
                       if tags.last == tag.downcase
                         tags.pop
                       end
                     else
                       tags << tag.downcase
                     end
                     parsed << full_tag
                   end
                 end
                 # Close any non closing tags
                 while tag = tags.pop
                   parsed << "</#{tag}>"
                 end
                 parsed
               end
               def parse_inline_attachments(text, project, obj, attr, only_path, options)
                 # when using an image link, try to use an attachment, if possible
                 attachments = options[:attachments] || []
                 attachments += obj.attachments if obj.respond_to?(:attachments)
                 if attachments.present?
                   text.gsub!(/src="([^\/"]+\.(bmp|gif|jpg|jpe|jpeg|png))"(\s+alt="([^"]*)")?/i) do |m|
                     filename, ext, alt, alttext = $1.downcase, $2, $3, $4
                     # search for the picture in attachments
                     if found = Attachment.latest_attach(attachments, filename)
                       image_url = download_named_attachment_path(found, found.filename, :only_path => only_path)
                       desc = found.description.to_s.gsub('"', '')
                       if !desc.blank? && alttext.blank?
                         alt = " title=\"#{desc}\" alt=\"#{desc}\""
                       end
                       "src=\"#{image_url}\"#{alt}"
                     else
                       m
                     end
                   end
                 end
               end
               # Wiki links
               #
               # Examples:
               #   [[mypage]]
               #   [[mypage|mytext]]
               # wiki links can refer other project wikis, using project name or identifier:
               #   [[project:]] -> wiki starting page
               #   [[project:|mytext]]
               #   [[project:mypage]]
               #   [[project:mypage|mytext]]
               def parse_wiki_links(text, project, obj, attr, only_path, options)
                 text.gsub!(/(!)?(\[\[([^\]\n\|]+)(\|([^\]\n\|]+))?\]\])/) do |m|
                   link_project = project
                   esc, all, page, title = $1, $2, $3, $5
                   if esc.nil?
                     if page =~ /^([^\:]+)\:(.*)$/
                       identifier, page = $1, $2
                       link_project = Project.find_by_identifier(identifier) || Project.find_by_name(identifier)
                       title ||= identifier if page.blank?
                     end
                     if link_project && link_project.wiki
                       # extract anchor
                       anchor = nil
                       if page =~ /^(.+?)\#(.+)$/
                         page, anchor = $1, $2
                       end
                       anchor = sanitize_anchor_name(anchor) if anchor.present?
                       # check if page exists
                       wiki_page = link_project.wiki.find_page(page)
                       url = if anchor.present? && wiki_page.present? && (obj.is_a?(WikiContent) || obj.is_a?(WikiContent::Version)) && obj.page == wiki_page
                         "##{anchor}"
                       else
                         case options[:wiki_links]
                         when :local; "#{page.present? ? Wiki.titleize(page) : ''}.html" + (anchor.present? ? "##{anchor}" : '')
                         when :anchor; "##{page.present? ? Wiki.titleize(page) : title}" + (anchor.present? ? "_#{anchor}" : '') # used for single-file wiki export
                         else
                           wiki_page_id = page.present? ? Wiki.titleize(page) : nil
                           parent = wiki_page.nil? && obj.is_a?(WikiContent) && obj.page && project == link_project ? obj.page.title : nil
                           url_for(:only_path => only_path, :controller => 'wiki', :action => 'show', :project_id => link_project,
                            :id => wiki_page_id, :version => nil, :anchor => anchor, :parent => parent)
                         end
                       end
                       link_to(title.present? ? title.html_safe : h(page), url, :class => ('wiki-page' + (wiki_page ? '' : ' new')))
                     else
                       # project or wiki doesn't exist
                       all
                     end
                   else
                     all
                   end
                 end
               end
               # Redmine links
               #
               # Examples:
               #   Issues:
               #     #52 -> Link to issue #52
               #   Changesets:
               #     r52 -> Link to revision 52
               #     commit:a85130f -> Link to scmid starting with a85130f
               #   Documents:
               #     document#17 -> Link to document with id 17
               #     document:Greetings -> Link to the document with title "Greetings"
               #     document:"Some document" -> Link to the document with title "Some document"
               #   Versions:
               #     version#3 -> Link to version with id 3
               #     version:1.0.0 -> Link to version named "1.0.0"
               #     version:"1.0 beta 2" -> Link to version named "1.0 beta 2"
               #   Attachments:
               #     attachment:file.zip -> Link to the attachment of the current object named file.zip
               #   Source files:
               #     source:some/file -> Link to the file located at /some/file in the project's repository
               #     source:some/file@52 -> Link to the file's revision 52
               #     source:some/file#L120 -> Link to line 120 of the file
               #     source:some/file@52#L120 -> Link to line 120 of the file's revision 52
               #     export:some/file -> Force the download of the file
               #   Forum messages:
               #     message#1218 -> Link to message with id 1218
               #  Projects:
               #     project:someproject -> Link to project named "someproject"
               #     project#3 -> Link to project with id 3
               #
               #   Links can refer other objects from other projects, using project identifier:
               #     identifier:r52
               #     identifier:document:"Some document"
               #     identifier:version:1.0.0
               #     identifier:source:some/file
               def parse_redmine_links(text, default_project, obj, attr, only_path, options)
                 text.gsub!(%r{([\s\(,\-\[\>]|^)(!)?(([a-z0-9\-_]+):)?(attachment|document|version|forum|news|message|project|commit|source|export)?(((#)|((([a-z0-9\-_]+)\|)?(r)))((\d+)((#note)?-(\d+))?)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]][^A-Za-z0-9_/])|,|\s|\]|<|$)}) do |m|
                   leading, esc, project_prefix, project_identifier, prefix, repo_prefix, repo_identifier, sep, identifier, comment_suffix, comment_id = $1, $2, $3, $4, $5, $10, $11, $8 || $12 || $18, $14 || $19, $15, $17
                   link = nil
                   project = default_project
                   if project_identifier
                     project = Project.visible.find_by_identifier(project_identifier)
                   end
                   if esc.nil?
                     if prefix.nil? && sep == 'r'
                       if project
                         repository = nil
                         if repo_identifier
                           repository = project.repositories.detect {|repo| repo.identifier == repo_identifier}
                         else
                           repository = project.repository
                         end
                         # project.changesets.visible raises an SQL error because of a double join on repositories
                         if repository &&
                              (changeset = Changeset.visible.
                                               find_by_repository_id_and_revision(repository.id, identifier))
                           link = link_to(h("#{project_prefix}#{repo_prefix}r#{identifier}"),
                                          {:only_path => only_path, :controller => 'repositories',
                                           :action => 'revision', :id => project,
                                           :repository_id => repository.identifier_param,
                                           :rev => changeset.revision},
                                          :class => 'changeset',
                                          :title => truncate_single_line_raw(changeset.comments, 100))
                         end
                       end
                     elsif sep == '#'
                       oid = identifier.to_i
                       case prefix
                       when nil
                         if oid.to_s == identifier &&
                               issue = Issue.visible.includes(:status).find_by_id(oid)
                           anchor = comment_id ? "note-#{comment_id}" : nil
                           link = link_to(h("##{oid}#{comment_suffix}"),
                                          {:only_path => only_path, :controller => 'issues',
                                           :action => 'show', :id => oid, :anchor => anchor},
                                          :class => issue.css_classes,
                                          :title => "#{issue.subject.truncate(100)} (#{issue.status.name})")
                         end
                       when 'document'
                         if document = Document.visible.find_by_id(oid)
                           link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                             :class => 'document'
                         end
                       when 'version'
                         if version = Version.visible.find_by_id(oid)
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
                       when 'message'
                         if message = Message.visible.includes(:parent).find_by_id(oid)
                           link = link_to_message(message, {:only_path => only_path}, :class => 'message')
                         end
                       when 'forum'
                         if board = Board.visible.find_by_id(oid)
                           link = link_to h(board.name), {:only_path => only_path, :controller => 'boards', :action => 'show', :id => board, :project_id => board.project},
                                                          :class => 'board'
                         end
                       when 'news'
                         if news = News.visible.find_by_id(oid)
                           link = link_to h(news.title), {:only_path => only_path, :controller => 'news', :action => 'show', :id => news},
                                                         :class => 'news'
                         end
                       when 'project'
                         if p = Project.visible.find_by_id(oid)
                           link = link_to_project(p, {:only_path => only_path}, :class => 'project')
                         end
                       end
                     elsif sep == ':'
                       # removes the double quotes if any
                       name = identifier.gsub(%r{^"(.*)"$}, "\\1")
                       name = CGI.unescapeHTML(name)
                       case prefix
                       when 'document'
                         if project && document = project.documents.visible.find_by_title(name)
                           link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
                                                             :class => 'document'
                         end
                       when 'version'
                         if project && version = project.versions.visible.find_by_name(name)
                           link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                                           :class => 'version'
                         end
                       when 'forum'
                         if project && board = project.boards.visible.find_by_name(name)
                           link = link_to h(board.name), {:only_path => only_path, :controller => 'boards', :action => 'show', :id => board, :project_id => board.project},
                                                          :class => 'board'
                         end
                       when 'news'
                         if project && news = project.news.visible.find_by_title(name)
                           link = link_to h(news.title), {:only_path => only_path, :controller => 'news', :action => 'show', :id => news},
                                                         :class => 'news'
                         end
                       when 'commit', 'source', 'export'
                         if project
                           repository = nil
                           if name =~ %r{^(([a-z0-9\-_]+)\|)(.+)$}
                             repo_prefix, repo_identifier, name = $1, $2, $3
                             repository = project.repositories.detect {|repo| repo.identifier == repo_identifier}
                           else
                             repository = project.repository
                           end
                           if prefix == 'commit'
                             if repository && (changeset = Changeset.visible.where("repository_id = ? AND scmid LIKE ?", repository.id, "#{name}%").first)
                               link = link_to h("#{project_prefix}#{repo_prefix}#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :repository_id => repository.identifier_param, :rev => changeset.identifier},
                                                            :class => 'changeset',
                                                            :title => truncate_single_line_raw(changeset.comments, 100)
                             end
                           else
                             if repository && User.current.allowed_to?(:browse_repository, project)
                               name =~ %r{^[/\\]*(.*?)(@([^/\\@]+?))?(#(L\d+))?$}
                               path, rev, anchor = $1, $3, $5
                               link = link_to h("#{project_prefix}#{prefix}:#{repo_prefix}#{name}"), {:only_path => only_path, :controller => 'repositories', :action => (prefix == 'export' ? 'raw' : 'entry'), :id => project, :repository_id => repository.identifier_param,
                                                                       :path => to_path_param(path),
                                                                       :rev => rev,
                                                                       :anchor => anchor},
                                                                      :class => (prefix == 'export' ? 'source download' : 'source')
                             end
                           end
                           repo_prefix = nil
                         end
                       when 'attachment'
                         attachments = options[:attachments] || []
                         attachments += obj.attachments if obj.respond_to?(:attachments)
                         if attachments && attachment = Attachment.latest_attach(attachments, name)
                           link = link_to_attachment(attachment, :only_path => only_path, :download => true, :class => 'attachment')
                         end
                       when 'project'
                         if p = Project.visible.where("identifier = :s OR LOWER(name) = :s", :s => name.downcase).first
                           link = link_to_project(p, {:only_path => only_path}, :class => 'project')
                         end
                       end
                     end
                   end
                   (leading + (link || "#{project_prefix}#{prefix}#{repo_prefix}#{sep}#{identifier}#{comment_suffix}"))
                 end
               end
               HEADING_RE = /(<h(\d)( [^>]+)?>(.+?)<\/h(\d)>)/i unless const_defined?(:HEADING_RE)
               def parse_sections(text, project, obj, attr, only_path, options)
                 return unless options[:edit_section_links]
                 text.gsub!(HEADING_RE) do
                   heading = $1
                   @current_section += 1
                   if @current_section > 1
                     content_tag('div',
                       link_to(image_tag('edit.png'), options[:edit_section_links].merge(:section => @current_section)),
                       :class => 'contextual',
                       :title => l(:button_edit_section),
                       :id => "section-#{@current_section}") + heading.html_safe
                   else
                     heading
                   end
                 end
               end
               # Headings and TOC
               # Adds ids and links to headings unless options[:headings] is set to false
               def parse_headings(text, project, obj, attr, only_path, options)
                 return if options[:headings] == false
                 text.gsub!(HEADING_RE) do
                   level, attrs, content = $2.to_i, $3, $4
                   item = strip_tags(content).strip
                   anchor = sanitize_anchor_name(item)
                   # used for single-file wiki export
                   anchor = "#{obj.page.title}_#{anchor}" if options[:wiki_links] == :anchor && (obj.is_a?(WikiContent) || obj.is_a?(WikiContent::Version))
                   @heading_anchors[anchor] ||= 0
                   idx = (@heading_anchors[anchor] += 1)
                   if idx > 1
                     anchor = "#{anchor}-#{idx}"
                   end
                   @parsed_headings << [level, anchor, item]
                   "<a name=\"#{anchor}\"></a>\n<h#{level} #{attrs}>#{content}<a href=\"##{anchor}\" class=\"wiki-anchor\">&para;</a></h#{level}>"
                 end
               end
               MACROS_RE = /(
                             (!)?                        # escaping
                             (
                             \{\{                        # opening tag
                             ([\w]+)                     # macro name
                             (\(([^\n\r]*?)\))?          # optional arguments
                             ([\n\r].*?[\n\r])?          # optional block of text
                             \}\}                        # closing tag
                             )
                            )/mx unless const_defined?(:MACROS_RE)
               MACRO_SUB_RE = /(
                               \{\{
                               macro\((\d+)\)
                               \}\}
                               )/x unless const_defined?(:MACRO_SUB_RE)
               # Extracts macros from text
               def catch_macros(text)
                 macros = {}
                 text.gsub!(MACROS_RE) do
                   all, macro = $1, $4.downcase
                   if macro_exists?(macro) || all =~ MACRO_SUB_RE
                     index = macros.size
                     macros[index] = all
                     "{{macro(#{index})}}"
                   else
                     all
                   end
                 end
                 macros
               end
               # Executes and replaces macros in text
               def inject_macros(text, obj, macros, execute=true)
                 text.gsub!(MACRO_SUB_RE) do
                   all, index = $1, $2.to_i
                   orig = macros.delete(index)
                   if execute && orig && orig =~ MACROS_RE
                     esc, all, macro, args, block = $2, $3, $4.downcase, $6.to_s, $7.try(:strip)
                     if esc.nil?
                       h(exec_macro(macro, obj, args, block) || all)
                     else
                       h(all)
                     end
                   elsif orig
                     h(orig)
                   else
                     h(all)
                   end
                 end
               end
               TOC_RE = /<p>\{\{((<|&lt;)|(>|&gt;))?toc\}\}<\/p>/i unless const_defined?(:TOC_RE)
               # Renders the TOC with given headings
               def replace_toc(text, headings)
                 text.gsub!(TOC_RE) do
                   left_align, right_align = $2, $3
                   # Keep only the 4 first levels
                   headings = headings.select{|level, anchor, item| level <= 4}
                   if headings.empty?
                     ''
                   else
                     div_class = 'toc'
                     div_class << ' right' if right_align
                     div_class << ' left' if left_align
                     out = "<ul class=\"#{div_class}\"><li>"
                     root = headings.map(&:first).min
                     current = root
                     started = false
                     headings.each do |level, anchor, item|
                       if level > current
                         out << '<ul><li>' * (level - current)
                       elsif level < current
                         out << "</li></ul>\n" * (current - level) + "</li><li>"
                       elsif started
                         out << '</li><li>'
                       end
                       out << "<a href=\"##{anchor}\">#{item}</a>"
                       current = level
                       started = true
                     end
                     out << '</li></ul>' * (current - root)
                     out << '</li></ul>'
                   end
                 end
               end
               # Same as Rails' simple_format helper without using paragraphs
               def simple_format_without_paragraph(text)
                 text.to_s.
                   gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
                   gsub(/\n\n+/, "<br /><br />").          # 2+ newline  -> 2 br
                   gsub(/([^\n]\n)(?=[^\n])/, '\1<br />'). # 1 newline   -> br
                   html_safe
               end
               def lang_options_for_select(blank=true)
                 (blank ? [["(auto)", ""]] : []) + languages_options
               end
               def label_tag_for(name, option_tags = nil, options = {})
                 label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
                 content_tag("label", label_text)
               end
               def labelled_form_for(*args, &proc)
                 args << {} unless args.last.is_a?(Hash)
                 options = args.last
                 if args.first.is_a?(Symbol)
                   options.merge!(:as => args.shift)
                 end
                 options.merge!({:builder => Redmine::Views::LabelledFormBuilder})
                 form_for(*args, &proc)
               end
               def labelled_fields_for(*args, &proc)
                 args << {} unless args.last.is_a?(Hash)
                 options = args.last
                 options.merge!({:builder => Redmine::Views::LabelledFormBuilder})
                 fields_for(*args, &proc)
               end
               def labelled_remote_form_for(*args, &proc)
                 ActiveSupport::Deprecation.warn "ApplicationHelper#labelled_remote_form_for is deprecated and will be removed in Redmine 2.2."
                 args << {} unless args.last.is_a?(Hash)
                 options = args.last
                 options.merge!({:builder => Redmine::Views::LabelledFormBuilder, :remote => true})
                 form_for(*args, &proc)
               end
               def error_messages_for(*objects)
                 html = ""
                 objects = objects.map {|o| o.is_a?(String) ? instance_variable_get("@#{o}") : o}.compact
                 errors = objects.map {|o| o.errors.full_messages}.flatten
                 if errors.any?
                   html << "<div id='errorExplanation'><ul>\n"
                   errors.each do |error|
                     html << "<li>#{h error}</li>\n"
                   end
                   html << "</ul></div>\n"
                 end
                 html.html_safe
               end
               def delete_link(url, options={})
                 options = {
                   :method => :delete,
                   :data => {:confirm => l(:text_are_you_sure)},
                   :class => 'icon icon-del'
                 }.merge(options)
                 link_to l(:button_delete), url, options
               end
               def preview_link(url, form, target='preview', options={})
                 content_tag 'a', l(:label_preview), {
                     :href => "#",
                     :onclick => %|submitPreview("#{escape_javascript url_for(url)}", "#{escape_javascript form}", "#{escape_javascript target}"); return false;|,
                     :accesskey => accesskey(:preview)
                   }.merge(options)
               end
               def link_to_function(name, function, html_options={})
                 content_tag(:a, name, {:href => '#', :onclick => "#{function}; return false;"}.merge(html_options))
               end
               # Helper to render JSON in views
               def raw_json(arg)
                 arg.to_json.to_s.gsub('/', '\/').html_safe
               end
               def back_url
                 url = params[:back_url]
                 if url.nil? && referer = request.env['HTTP_REFERER']
                   url = CGI.unescape(referer.to_s)
                 end
                 url
               end
               def back_url_hidden_field_tag
                 url = back_url
                 hidden_field_tag('back_url', url, :id => nil) unless url.blank?
               end
               def check_all_links(form_name)
                 link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
                 " | ".html_safe +
                 link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
               end
               def progress_bar(pcts, options={})
                 pcts = [pcts, pcts] unless pcts.is_a?(Array)
                 pcts = pcts.collect(&:round)
                 pcts[1] = pcts[1] - pcts[0]
                 pcts << (100 - pcts[1] - pcts[0])
                 width = options[:width] || '100px;'
                 legend = options[:legend] || ''
                 content_tag('table',
                   content_tag('tr',
                     (pcts[0] > 0 ? content_tag('td', '', :style => "width: #{pcts[0]}%;", :class => 'closed') : ''.html_safe) +
                     (pcts[1] > 0 ? content_tag('td', '', :style => "width: #{pcts[1]}%;", :class => 'done') : ''.html_safe) +
                     (pcts[2] > 0 ? content_tag('td', '', :style => "width: #{pcts[2]}%;", :class => 'todo') : ''.html_safe)
                   ), :class => "progress progress-#{pcts[0]}", :style => "width: #{width};").html_safe +
                   content_tag('p', legend, :class => 'percent').html_safe
               end
               def checked_image(checked=true)
                 if checked
                   image_tag 'toggle_check.png'
                 end
               end
               def context_menu(url)
                 unless @context_menu_included
                   content_for :header_tags do
                     javascript_include_tag('context_menu') +
                       stylesheet_link_tag('context_menu')
                   end
                   if l(:direction) == 'rtl'
                     content_for :header_tags do
                       stylesheet_link_tag('context_menu_rtl')
                     end
                   end
                   @context_menu_included = true
                 end
                 javascript_tag "contextMenuInit('#{ url_for(url) }')"
               end
               def calendar_for(field_id)
                 include_calendar_headers_tags
                 javascript_tag("$(function() { $('##{field_id}').datepicker(datepickerOptions); });")
               end
               def include_calendar_headers_tags
                 unless @calendar_headers_tags_included
                   tags = javascript_include_tag("datepicker")
                   @calendar_headers_tags_included = true
                   content_for :header_tags do
                     start_of_week = Setting.start_of_week
                     start_of_week = l(:general_first_day_of_week, :default => '1') if start_of_week.blank?
                     # Redmine uses 1..7 (monday..sunday) in settings and locales
                     # JQuery uses 0..6 (sunday..saturday), 7 needs to be changed to 0
                     start_of_week = start_of_week.to_i % 7
                     tags << javascript_tag(
                                "var datepickerOptions={dateFormat: 'yy-mm-dd', firstDay: #{start_of_week}, " +
                                  "showOn: 'button', buttonImageOnly: true, buttonImage: '" +
                                  path_to_image('/images/calendar.png') +
                                  "', showButtonPanel: true, showWeek: true, showOtherMonths: true, " +
                                  "selectOtherMonths: true, changeMonth: true, changeYear: true, " +
                                  "beforeShow: beforeShowDatePicker};")
                     jquery_locale = l('jquery.locale', :default => current_language.to_s)
                     unless jquery_locale == 'en'
                       tags << javascript_include_tag("i18n/datepicker-#{jquery_locale}.js")
                     end
                     tags
                   end
                 end
               end
               # Overrides Rails' stylesheet_link_tag with themes and plugins support.
               # Examples:
               #   stylesheet_link_tag('styles') # => picks styles.css from the current theme or defaults
               #   stylesheet_link_tag('styles', :plugin => 'foo) # => picks styles.css from plugin's assets
               #
               def stylesheet_link_tag(*sources)
                 options = sources.last.is_a?(Hash) ? sources.pop : {}
                 plugin = options.delete(:plugin)
                 sources = sources.map do |source|
                   if plugin
                     "/plugin_assets/#{plugin}/stylesheets/#{source}"
                   elsif current_theme && current_theme.stylesheets.include?(source)
                     current_theme.stylesheet_path(source)
                   else
                     source
                   end
                 end
                 super sources, options
               end
               # Overrides Rails' image_tag with themes and plugins support.
               # Examples:
               #   image_tag('image.png') # => picks image.png from the current theme or defaults
               #   image_tag('image.png', :plugin => 'foo) # => picks image.png from plugin's assets
               #
               def image_tag(source, options={})
                 if plugin = options.delete(:plugin)
                   source = "/plugin_assets/#{plugin}/images/#{source}"
                 elsif current_theme && current_theme.images.include?(source)
                   source = current_theme.image_path(source)
                 end
                 super source, options
               end
               # Overrides Rails' javascript_include_tag with plugins support
               # Examples:
               #   javascript_include_tag('scripts') # => picks scripts.js from defaults
               #   javascript_include_tag('scripts', :plugin => 'foo) # => picks scripts.js from plugin's assets
               #
               def javascript_include_tag(*sources)
                 options = sources.last.is_a?(Hash) ? sources.pop : {}
                 if plugin = options.delete(:plugin)
                   sources = sources.map do |source|
                     if plugin
                       "/plugin_assets/#{plugin}/javascripts/#{source}"
                     else
                       source
                     end
                   end
                 end
                 super sources, options
               end
               # TODO: remove this in 2.5.0
               def has_content?(name)
                 content_for?(name)
               end
               def sidebar_content?
                 content_for?(:sidebar) || view_layouts_base_sidebar_hook_response.present?
               end
               def view_layouts_base_sidebar_hook_response
                 @view_layouts_base_sidebar_hook_response ||= call_hook(:view_layouts_base_sidebar)
               end
               def email_delivery_enabled?
                 !!ActionMailer::Base.perform_deliveries
               end
               # Returns the avatar image tag for the given +user+ if avatars are enabled
               # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>')
               def avatar(user, options = { })
                 if Setting.gravatar_enabled?
                   options.merge!({:ssl => (request && request.ssl?), :default => Setting.gravatar_default})
                   email = nil
                   if user.respond_to?(:mail)
                     email = user.mail
                   elsif user.to_s =~ %r{<(.+?)>}
                     email = $1
                   end
                   return gravatar(email.to_s.downcase, options) unless email.blank? rescue nil
                 else
                   ''
                 end
               end
               def sanitize_anchor_name(anchor)
                 if ''.respond_to?(:encoding) || RUBY_PLATFORM == 'java'
                   anchor.gsub(%r{[^\s\-\p{Word}]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
                 else
                   # TODO: remove when ruby1.8 is no longer supported
                   anchor.gsub(%r{[^\w\s\-]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
                 end
               end
               # Returns the javascript tags that are included in the html layout head
               def javascript_heads
                 tags = javascript_include_tag('jquery-1.11.1-ui-1.11.0-ujs-3.1.1', 'application')
                 unless User.current.pref.warn_on_leaving_unsaved == '0'
                   tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
                 end
                 tags
               end
               def favicon
                 "<link rel='shortcut icon' href='#{favicon_path}' />".html_safe
               end
               # Returns the path to the favicon
               def favicon_path
                 icon = (current_theme && current_theme.favicon?) ? current_theme.favicon_path : '/favicon.ico'
                 image_path(icon)
               end
               # Returns the full URL to the favicon
               def favicon_url
                 # TODO: use #image_url introduced in Rails4
                 path = favicon_path
                 base = url_for(:controller => 'welcome', :action => 'index', :only_path => false)
                 base.sub(%r{/+$},'') + '/' + path.sub(%r{^/+},'')
               end
               def robot_exclusion_tag
                 '<meta name="robots" content="noindex,follow,noarchive" />'.html_safe
               end
               # Returns true if arg is expected in the API response
               def include_in_api_response?(arg)
                 unless @included_in_api_response
                   param = params[:include]
                   @included_in_api_response = param.is_a?(Array) ? param.collect(&:to_s) : param.to_s.split(',')
                   @included_in_api_response.collect!(&:strip)
                 end
                 @included_in_api_response.include?(arg.to_s)
               end
               # Returns options or nil if nometa param or X-Redmine-Nometa header
               # was set in the request
               def api_meta(options)
                 if params[:nometa].present? || request.headers['X-Redmine-Nometa']
                   # compatibility mode for activeresource clients that raise
                   # an error when deserializing an array with attributes
                   nil
                 else
                   options
                 end
               end
               private
               def wiki_helper
                 helper = Redmine::WikiFormatting.helper_for(Setting.text_formatting)
                 extend helper
                 return self
               end
               def link_to_content_update(text, url_params = {}, html_options = {})
                 link_to(text, url_params, html_options)
               end
             end

app/models/time_entry.rb +6 -4

             # Redmine - project management software
             # Copyright (C) 2006-2014  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 TimeEntry < ActiveRecord::Base
               include Redmine::SafeAttributes
               # could have used polymorphic association
               # project association here allows easy loading of time entries at project level with one database trip
               belongs_to :project
               belongs_to :issue
               belongs_to :user
               belongs_to :activity, :class_name => 'TimeEntryActivity', :foreign_key => 'activity_id'
-              attr_protected :project_id, :user_id, :tyear, :tmonth, :tweek
+              attr_protected :user_id, :tyear, :tmonth, :tweek
               acts_as_customizable
               acts_as_event :title => Proc.new {|o| "#{l_hours(o.hours)} (#{(o.issue || o.project).event_title})"},
                             :url => Proc.new {|o| {:controller => 'timelog', :action => 'index', :project_id => o.project, :issue_id => o.issue}},
                             :author => :user,
                             :group => :issue,
                             :description => :comments
               acts_as_activity_provider :timestamp => "#{table_name}.created_on",
                                         :author_key => :user_id,
                                         :find_options => {:include => :project}
               validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
               validates_numericality_of :hours, :allow_nil => true, :message => :invalid
               validates_length_of :comments, :maximum => 255, :allow_nil => true
               validates :spent_on, :date => true
               before_validation :set_project_if_nil
               validate :validate_time_entry
               scope :visible, lambda {|*args|
                 includes(:project).where(Project.allowed_to_condition(args.shift || User.current, :view_time_entries, *args))
               }
               scope :on_issue, lambda {|issue|
                 includes(:issue).where("#{Issue.table_name}.root_id = #{issue.root_id} AND #{Issue.table_name}.lft >= #{issue.lft} AND #{Issue.table_name}.rgt <= #{issue.rgt}")
               }
               scope :on_project, lambda {|project, include_subprojects|
                 includes(:project).where(project.project_condition(include_subprojects))
               }
               scope :spent_between, lambda {|from, to|
                 if from && to
                  where("#{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", from, to)
                 elsif from
                  where("#{TimeEntry.table_name}.spent_on >= ?", from)
                 elsif to
                  where("#{TimeEntry.table_name}.spent_on <= ?", to)
                 else
                  where(nil)
                 end
               }
-              safe_attributes 'hours', 'comments', 'issue_id', 'activity_id', 'spent_on', 'custom_field_values', 'custom_fields'
+              safe_attributes 'hours', 'comments', 'project_id', 'issue_id', 'activity_id', 'spent_on', 'custom_field_values', 'custom_fields'
               def initialize(attributes=nil, *args)
                 super
                 if new_record? && self.activity.nil?
                   if default_activity = TimeEntryActivity.default
                     self.activity_id = default_activity.id
                   end
                   self.hours = nil if hours == 0
                 end
               end
               def safe_attributes=(attrs, user=User.current)
-                attrs = super
+                if attrs
-                if !new_record? && issue && issue.project_id != project_id
+                  attrs = super(attrs)
+                  if issue_id_changed? && attrs[:project_id].blank? && issue && issue.project_id != project_id
                     if user.allowed_to?(:log_time, issue.project)
                       self.project_id = issue.project_id
                     end
                   end
+                end
                 attrs
               end
               def set_project_if_nil
                 self.project = issue.project if issue && project.nil?
               end
               def validate_time_entry
                 errors.add :hours, :invalid if hours && (hours < 0 || hours >= 1000)
                 errors.add :project_id, :invalid if project.nil?
                 errors.add :issue_id, :invalid if (issue_id && !issue) || (issue && project!=issue.project)
               end
               def hours=(h)
                 write_attribute :hours, (h.is_a?(String) ? (h.to_hours || h) : h)
               end
               def hours
                 h = read_attribute(:hours)
                 if h.is_a?(Float)
                   h.round(2)
                 else
                   h
                 end
               end
               # tyear, tmonth, tweek assigned where setting spent_on attributes
               # these attributes make time aggregations easier
               def spent_on=(date)
                 super
                 if spent_on.is_a?(Time)
                   self.spent_on = spent_on.to_date
                 end
                 self.tyear = spent_on ? spent_on.year : nil
                 self.tmonth = spent_on ? spent_on.month : nil
                 self.tweek = spent_on ? Date.civil(spent_on.year, spent_on.month, spent_on.day).cweek : nil
               end
               # Returns true if the time entry can be edited by usr, otherwise false
               def editable_by?(usr)
                 (usr == user && usr.allowed_to?(:edit_own_time_entries, project)) || usr.allowed_to?(:edit_time_entries, project)
               end
               # Returns the custom_field_values that can be edited by the given user
               def editable_custom_field_values(user=nil)
                 visible_custom_field_values
               end
               # Returns the custom fields that can be edited by the given user
               def editable_custom_fields(user=nil)
                 editable_custom_field_values(user).map(&:custom_field).uniq
               end
             end

app/views/issues/show.html.erb +1 -1

             <%= render :partial => 'action_menu' %>
             <h2><%= issue_heading(@issue) %></h2>
             <div class="<%= @issue.css_classes %> details">
               <% if @prev_issue_id || @next_issue_id %>
                 <div class="next-prev-links contextual">
                   <%= link_to_if @prev_issue_id,
                                  "\xc2\xab #{l(:label_previous)}",
                                  (@prev_issue_id ? issue_path(@prev_issue_id) : nil),
                                  :title => "##{@prev_issue_id}" %> |
                   <% if @issue_position && @issue_count %>
                     <span class="position"><%= l(:label_item_position, :position => @issue_position, :count => @issue_count) %></span> |
                   <% end %>
                   <%= link_to_if @next_issue_id,
                                  "#{l(:label_next)} \xc2\xbb",
                                  (@next_issue_id ? issue_path(@next_issue_id) : nil),
                                  :title => "##{@next_issue_id}" %>
                 </div>
               <% end %>
               <%= avatar(@issue.author, :size => "50") %>
             <div class="subject">
             <%= render_issue_subject_with_tree(@issue) %>
             </div>
                     <p class="author">
                     <%= authoring @issue.created_on, @issue.author %>.
                     <% if @issue.created_on != @issue.updated_on %>
                     <%= l(:label_updated_time, time_tag(@issue.updated_on)).html_safe %>.
                     <% end %>
                     </p>
             <table class="attributes">
             <%= issue_fields_rows do |rows|
               rows.left l(:field_status), h(@issue.status.name), :class => 'status'
               rows.left l(:field_priority), h(@issue.priority.name), :class => 'priority'
               unless @issue.disabled_core_fields.include?('assigned_to_id')
                 rows.left l(:field_assigned_to), avatar(@issue.assigned_to, :size => "14").to_s.html_safe + (@issue.assigned_to ? link_to_user(@issue.assigned_to) : "-"), :class => 'assigned-to'
               end
               unless @issue.disabled_core_fields.include?('category_id')
                 rows.left l(:field_category), h(@issue.category ? @issue.category.name : "-"), :class => 'category'
               end
               unless @issue.disabled_core_fields.include?('fixed_version_id')
                 rows.left l(:field_fixed_version), (@issue.fixed_version ? link_to_version(@issue.fixed_version) : "-"), :class => 'fixed-version'
               end
               unless @issue.disabled_core_fields.include?('start_date')
                 rows.right l(:field_start_date), format_date(@issue.start_date), :class => 'start-date'
               end
               unless @issue.disabled_core_fields.include?('due_date')
                 rows.right l(:field_due_date), format_date(@issue.due_date), :class => 'due-date'
               end
               unless @issue.disabled_core_fields.include?('done_ratio')
                 rows.right l(:field_done_ratio), progress_bar(@issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%"), :class => 'progress'
               end
               unless @issue.disabled_core_fields.include?('estimated_hours')
                 unless @issue.estimated_hours.nil?
                   rows.right l(:field_estimated_hours), l_hours(@issue.estimated_hours), :class => 'estimated-hours'
                 end
               end
               if User.current.allowed_to?(:view_time_entries, @project)
-                rows.right l(:label_spent_time), (@issue.total_spent_hours > 0 ? link_to(l_hours(@issue.total_spent_hours), project_issue_time_entries_path(@project, @issue)) : "-"), :class => 'spent-time'
+                rows.right l(:label_spent_time), (@issue.total_spent_hours > 0 ? link_to(l_hours(@issue.total_spent_hours), issue_time_entries_path(@issue)) : "-"), :class => 'spent-time'
               end
             end %>
             <%= render_custom_fields_rows(@issue) %>
             <%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
             </table>
             <% if @issue.description? || @issue.attachments.any? -%>
             <hr />
             <% if @issue.description? %>
             <div class="description">
               <div class="contextual">
               <%= link_to l(:button_quote), quoted_issue_path(@issue), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
               </div>
               <p><strong><%=l(:field_description)%></strong></p>
               <div class="wiki">
               <%= textilizable @issue, :description, :attachments => @issue.attachments %>
               </div>
             </div>
             <% end %>
             <%= link_to_attachments @issue, :thumbnails => true %>
             <% end -%>
             <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
             <% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
             <hr />
             <div id="issue_tree">
             <div class="contextual">
               <%= link_to_new_subtask(@issue) if User.current.allowed_to?(:manage_subtasks, @project) %>
             </div>
             <p><strong><%=l(:label_subtask_plural)%></strong></p>
             <%= render_descendants_tree(@issue) unless @issue.leaf? %>
             </div>
             <% end %>
             <% if @relations.present? || User.current.allowed_to?(:manage_issue_relations, @project) %>
             <hr />
             <div id="relations">
             <%= render :partial => 'relations' %>
             </div>
             <% end %>
             </div>
             <% if @changesets.present? %>
             <div id="issue-changesets">
             <h3><%=l(:label_associated_revisions)%></h3>
             <%= render :partial => 'changesets', :locals => { :changesets => @changesets} %>
             </div>
             <% end %>
             <% if @journals.present? %>
             <div id="history">
             <h3><%=l(:label_history)%></h3>
             <%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
             </div>
             <% end %>
             <div style="clear: both;"></div>
             <%= render :partial => 'action_menu' %>
             <div style="clear: both;"></div>
             <% if @issue.editable? %>
               <div id="update" style="display:none;">
               <h3><%= l(:button_edit) %></h3>
               <%= render :partial => 'edit' %>
               </div>
             <% end %>
             <% other_formats_links do |f| %>
               <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
               <%= f.link_to 'PDF' %>
             <% end %>
             <% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
             <% content_for :sidebar do %>
               <%= render :partial => 'issues/sidebar' %>
               <% if User.current.allowed_to?(:add_issue_watchers, @project) ||
                 (@issue.watchers.present? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
                 <div id="watchers">
                   <%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
                 </div>
               <% end %>
             <% end %>
             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
             <% end %>
             <%= context_menu issues_context_menu_path %>

app/views/timelog/_form.html.erb +5 -3

             <%= error_messages_for 'time_entry' %>
             <%= back_url_hidden_field_tag %>
             <div class="box tabular">
               <% if @time_entry.new_record? %>
-                <% if params[:project_id] || @time_entry.issue %>
+                <% if params[:project_id] %>
-                  <%= f.hidden_field :project_id %>
+                  <%= hidden_field_tag 'project_id', params[:project_id] %>
+                <% elsif params[:issue_id] %>
+                  <%= hidden_field_tag 'issue_id', params[:issue_id] %>
                 <% else %>
-                  <p><%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).all, :selected => @time_entry.project), :required => true %></p>
+                  <p><%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).all, :selected => @time_entry.project, :include_blank => true) %></p>
                 <% end %>
               <% end %>
               <p>
                 <%= f.text_field :issue_id, :size => 6 %>
                 <span id="time_entry_issue"><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></span>
               </p>
               <p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
               <p><%= f.text_field :hours, :size => 6, :required => true %></p>
               <p><%= f.text_field :comments, :size => 100, :maxlength => 255 %></p>
               <p><%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %></p>
               <% @time_entry.custom_field_values.each do |value| %>
                 <p><%= custom_field_tag_with_label :time_entry, value %></p>
               <% end %>
               <%= call_hook(:view_timelog_edit_form_bottom, { :time_entry => @time_entry, :form => f }) %>
             </div>
             <%= javascript_tag do %>
               observeAutocompleteField('time_entry_issue_id', '<%= escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (@project ? nil : 'all'))%>', {
                 select: function(event, ui) {
                   $('#time_entry_issue').text(ui.item.label);
                 }
               });
             <% end %>

app/views/timelog/new.html.erb 0 -1

             <h2><%= l(:label_spent_time) %></h2>
             <%= labelled_form_for @time_entry, :url => time_entries_path do |f| %>
-              <%= hidden_field_tag 'project_id', params[:project_id] if params[:project_id] %>
               <%= render :partial => 'form', :locals => {:f => f} %>
               <%= submit_tag l(:button_create) %>
               <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
             <% end %>

test/functional/timelog_controller_test.rb +69 -37

             # -*- coding: utf-8 -*-
             # Redmine - project management software
             # Copyright (C) 2006-2014  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_with_project_id
+              def test_new
                 @request.session[:user_id] = 3
-                get :new, :project_id => 1
+                get :new
                 assert_response :success
                 assert_template 'new'
-                assert_select 'select[name=?]', 'time_entry[project_id]', 0
+                assert_select 'input[name=?][type=hidden]', 'project_id', 0
-                assert_select 'input[name=?][value=1][type=hidden]', 'time_entry[project_id]'
+                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_issue_id
+              def test_new_with_project_id
                 @request.session[:user_id] = 3
-                get :new, :issue_id => 2
+                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
-                assert_select 'input[name=?][value=1][type=hidden]', 'time_entry[project_id]'
               end
-              def test_new_without_project
+              def test_new_with_issue_id
                 @request.session[:user_id] = 3
-                get :new
+                get :new, :issue_id => 2
                 assert_response :success
                 assert_template 'new'
-                assert_select 'select[name=?]', 'time_entry[project_id]'
+                assert_select 'input[name=?][type=hidden]', 'project_id', 0
-                assert_select 'input[name=?]', 'time_entry[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
-                assert_select 'input[name=?]', 'time_entry[project_id]', 0
               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_no_tag 'option', :content => 'Inactive Activity'
               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'
                 # Default activity selected
                 assert_tag :tag => 'form', :attributes => { :action => '/projects/ecookbook/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!
                 @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_tag :tag => 'option', :content => '--- Please select ---'
               end
               def test_post_create
-                # TODO: should POST to issues’ time log instead of project. change form
-                # and routing
                 @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 :action => 'index', :project_id => 'ecookbook'
+                  assert_redirected_to '/projects/ecookbook/time_entries'
+                end
-                i = Issue.find(1)
+                t = TimeEntry.order('id DESC').first
-                t = TimeEntry.find_by_comments('Some work on TimelogControllerTest')
                 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
-                assert_equal i, t.issue
-                assert_equal i.project, t.project
               end
               def test_post_create_with_blank_issue
-                # TODO: should POST to issues’ time log instead of project. change form
-                # and routing
                 @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 :action => 'index', :project_id => 'ecookbook'
+                  assert_redirected_to '/projects/ecookbook/time_entries'
+                end
-                t = TimeEntry.find_by_comments('Some work on TimelogControllerTest')
+                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_and_continue
+              def test_create_and_continue_at_project_level
                 @request.session[:user_id] = 2
-                post :create, :project_id => 1,
+                assert_difference 'TimeEntry.count' do
-                            :time_entry => {:activity_id => '11',
+                  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 '/projects/ecookbook/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D='
+                  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_with_issue_id
+              def test_create_and_continue_at_issue_level
                 @request.session[:user_id] = 2
-                post :create, :project_id => 1,
+                assert_difference 'TimeEntry.count' do
-                            :time_entry => {:activity_id => '11',
+                  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 '/projects/ecookbook/issues/1/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=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_without_project
+              def test_create_and_continue_with_project_id
                 @request.session[:user_id] = 2
-                post :create, :time_entry => {:project_id => '1',
+                assert_difference 'TimeEntry.count' do
-                                            :activity_id => '11',
+                  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
-                assert_redirected_to '/time_entries/new?time_entry%5Bactivity_id%5D=11&time_entry%5Bissue_id%5D=&time_entry%5Bproject_id%5D=1'
+              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_tag 'select', :attributes => {:name => 'time_entry[project_id]'},
                   :child => {:tag => 'option', :attributes => {:value => '1', :selected => 'selected'}}
               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_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_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_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_tag :form,
                   :attributes => {:action => "/time_entries", :id => 'query_form'}
               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_tag 'a', :attributes => {:href => '/time_entries/new'}, :content => /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_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               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_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               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_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               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_tag :form,
                   :attributes => {:action => "/projects/ecookbook/time_entries", :id => 'query_form'}
               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)
-                # TODO: remove /projects/:project_id/issues/:issue_id/time_entries routes
-                # to use /issues/:issue_id/time_entries
                 assert_tag :form,
                   :attributes => {:action => "/projects/ecookbook/issues/1/time_entries", :id => 'query_form'}
               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_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]', '&gt;='
                     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, :project_id => 'ecookbook', :issue_id => 3
                 assert_response :success
                 assert_select '#csv-export-options' do
                   assert_select 'form[action=?][method=get]', '/projects/ecookbook/issues/3/time_entries.csv'
                 end
               end
               def test_index_csv_all_projects
                 Setting.date_format = '%m/%d/%Y'
                 get :index, :format => 'csv'
                 assert_response :success
                 assert_equal 'text/csv; header=present', response.content_type
               end
               def test_index_csv
                 Setting.date_format = '%m/%d/%Y'
                 get :index, :project_id => 1, :format => 'csv'
                 assert_response :success
                 assert_equal 'text/csv; header=present', response.content_type
               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