jro_apps/redmine Commit - r15618:35dff9428f72

Merged r15955 and r15956 (#24297)....

Jean-Philippe Lang -

r15618:35dff9428f72

parent child

Context file:

r15618:35dff9428f72

Collapse all files

app/controllers/timelog_controller.rb +7 -3

              # Redmine - project management software
              # Copyright (C) 2006-2016  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              class TimelogController < ApplicationController
                menu_item :issues
                before_filter :find_time_entry, :only => [:show, :edit, :update]
+               before_filter :check_editability, :only => [:edit, :update]
                before_filter :find_time_entries, :only => [:bulk_edit, :bulk_update, :destroy]
                before_filter :authorize, :only => [:show, :edit, :update, :bulk_edit, :bulk_update, :destroy]
                before_filter :find_optional_project, :only => [:new, :create, :index, :report]
                before_filter :authorize_global, :only => [:new, :create, :index, :report]
                accept_rss_auth :index
                accept_api_auth :index, :show, :create, :update, :destroy
                rescue_from Query::StatementInvalid, :with => :query_statement_invalid
                helper :sort
                include SortHelper
                helper :issues
                include TimelogHelper
                helper :custom_fields
                include CustomFieldsHelper
                helper :queries
                include QueriesHelper
                def index
                  @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).to_a
                      @total_hours = scope.sum(:hours).to_f
                      render :layout => !request.xhr?
                    }
                    format.api  {
                      @entry_count = scope.count
                      @offset, @limit = api_offset_and_limit
                      @entries = scope.offset(@offset).limit(@limit).preload(:custom_values => :custom_field).to_a
                    }
                    format.atom {
                      entries = scope.limit(Setting.feeds_limit.to_i).reorder("#{TimeEntry.table_name}.created_on DESC").to_a
                      render_feed(entries, :title => l(:label_spent_time))
                    }
                    format.csv {
                      # Export all entries
                      @entries = scope.to_a
                      send_data(query_to_csv(@entries, @query, params), :type => 'text/csv; header=present', :filename => 'timelog.csv')
                    }
                  end
                end
                def report
                  @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]
                          options = {
                            :time_entry => {
                              :project_id => params[:time_entry][:project_id],
                              :issue_id => @time_entry.issue_id,
                              :activity_id => @time_entry.activity_id
                            },
                            :back_url => params[:back_url]
                          }
                          if params[:project_id] && @time_entry.project
                            redirect_to new_project_time_entry_path(@time_entry.project, options)
                          elsif params[:issue_id] && @time_entry.issue
                            redirect_to new_issue_time_entry_path(@time_entry.issue, options)
                          else
                            redirect_to new_time_entry_path(options)
                          end
                        else
                          redirect_back_or_default project_time_entries_path(@time_entry.project)
                        end
                      }
                      format.api  { render :action => 'show', :status => :created, :location => time_entry_url(@time_entry) }
                    end
                  else
                    respond_to do |format|
                      format.html { render :action => 'new' }
                      format.api  { render_validation_errors(@time_entry) }
                    end
                  end
                end
                def edit
                  @time_entry.safe_attributes = params[:time_entry]
                end
                def update
                  @time_entry.safe_attributes = params[:time_entry]
                  call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
                  if @time_entry.save
                    respond_to do |format|
                      format.html {
                        flash[:notice] = l(:notice_successful_update)
                        redirect_back_or_default project_time_entries_path(@time_entry.project)
                      }
                      format.api  { render_api_ok }
                    end
                  else
                    respond_to do |format|
                      format.html { render :action => 'edit' }
                      format.api  { render_validation_errors(@time_entry) }
                    end
                  end
                end
                def bulk_edit
                  @available_activities = TimeEntryActivity.shared.active
                  @custom_fields = TimeEntry.first.available_custom_fields
                end
                def bulk_update
                  attributes = parse_params_for_bulk_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])
+                 @project = @time_entry.project
+               rescue ActiveRecord::RecordNotFound
+                 render_404
+               end
+               def check_editability
                  unless @time_entry.editable_by?(User.current)
                    render_403
                    return false
                  end
-                 @project = @time_entry.project
-               rescue ActiveRecord::RecordNotFound
-                 render_404
                end
                def find_time_entries
                  @time_entries = TimeEntry.where(:id => params[:id] || params[:ids]).to_a
                  raise ActiveRecord::RecordNotFound if @time_entries.empty?
                  raise Unauthorized unless @time_entries.all? {|t| t.editable_by?(User.current)}
                  @projects = @time_entries.collect(&:project).compact.uniq
                  @project = @projects.first if @projects.size == 1
                rescue ActiveRecord::RecordNotFound
                  render_404
                end
                def set_flash_from_bulk_time_entry_save(time_entries, unsaved_time_entry_ids)
                  if unsaved_time_entry_ids.empty?
                    flash[:notice] = l(:notice_successful_update) unless time_entries.empty?
                  else
                    flash[:error] = l(:notice_failed_to_save_time_entries,
                                      :count => unsaved_time_entry_ids.size,
                                      :total => time_entries.size,
                                      :ids => '#' + unsaved_time_entry_ids.join(', #'))
                  end
                end
                def find_optional_project
                  if params[:issue_id].present?
                    @issue = Issue.find(params[:issue_id])
                    @project = @issue.project
                  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'}
                  if custom = attributes[:custom_field_values]
                    custom.reject! {|k,v| v.blank?}
                    custom.keys.each do |k|
                      if custom[k].is_a?(Array)
                        custom[k] << '' if custom[k].delete('__none__')
                      else
                        custom[k] = '' if custom[k] == '__none__'
                      end
                    end
                  end
                  attributes
                end
              end

test/integration/api_test/time_entries_test.rb +11 0

              # Redmine - project management software
              # Copyright (C) 2006-2016  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require File.expand_path('../../../test_helper', __FILE__)
              class Redmine::ApiTest::TimeEntriesTest < Redmine::ApiTest::Base
                fixtures :projects, :trackers, :issue_statuses, :issues,
                         :enumerations, :users, :issue_categories,
                         :projects_trackers,
                         :roles,
                         :member_roles,
                         :members,
                         :enabled_modules,
                         :time_entries
                test "GET /time_entries.xml should return time entries" do
                  get '/time_entries.xml', {}, credentials('jsmith')
                  assert_response :success
                  assert_equal 'application/xml', @response.content_type
                  assert_select 'time_entries[type=array] time_entry id', :text => '2'
                end
                test "GET /time_entries.xml with limit should return limited results" do
                  get '/time_entries.xml?limit=2', {}, credentials('jsmith')
                  assert_response :success
                  assert_equal 'application/xml', @response.content_type
                  assert_select 'time_entries[type=array] time_entry', 2
                end
                test "GET /time_entries/:id.xml should return the time entry" do
                  get '/time_entries/2.xml', {}, credentials('jsmith')
                  assert_response :success
                  assert_equal 'application/xml', @response.content_type
                  assert_select 'time_entry id', :text => '2'
                end
+               test "GET /time_entries/:id.xml on closed project should return the time entry" do
+                 project = TimeEntry.find(2).project
+                 project.close
+                 project.save!
+                 get '/time_entries/2.xml', {}, credentials('jsmith')
+                 assert_response :success
+                 assert_equal 'application/xml', @response.content_type
+                 assert_select 'time_entry id', :text => '2'
+               end
                test "POST /time_entries.xml with issue_id should create time entry" do
                  assert_difference 'TimeEntry.count' do
                    post '/time_entries.xml', {:time_entry => {:issue_id => '1', :spent_on => '2010-12-02', :hours => '3.5', :activity_id => '11'}}, credentials('jsmith')
                  end
                  assert_response :created
                  assert_equal 'application/xml', @response.content_type
                  entry = TimeEntry.order('id DESC').first
                  assert_equal 'jsmith', entry.user.login
                  assert_equal Issue.find(1), entry.issue
                  assert_equal Project.find(1), entry.project
                  assert_equal Date.parse('2010-12-02'), entry.spent_on
                  assert_equal 3.5, entry.hours
                  assert_equal TimeEntryActivity.find(11), entry.activity
                end
                test "POST /time_entries.xml with issue_id should accept custom fields" do
                  field = TimeEntryCustomField.create!(:name => 'Test', :field_format => 'string')
                  assert_difference 'TimeEntry.count' do
                    post '/time_entries.xml', {:time_entry => {
                      :issue_id => '1', :spent_on => '2010-12-02', :hours => '3.5', :activity_id => '11', :custom_fields => [{:id => field.id.to_s, :value => 'accepted'}]
                    }}, credentials('jsmith')
                  end
                  assert_response :created
                  assert_equal 'application/xml', @response.content_type
                  entry = TimeEntry.order('id DESC').first
                  assert_equal 'accepted', entry.custom_field_value(field)
                end
                test "POST /time_entries.xml with project_id should create time entry" do
                  assert_difference 'TimeEntry.count' do
                    post '/time_entries.xml', {:time_entry => {:project_id => '1', :spent_on => '2010-12-02', :hours => '3.5', :activity_id => '11'}}, credentials('jsmith')
                  end
                  assert_response :created
                  assert_equal 'application/xml', @response.content_type
                  entry = TimeEntry.order('id DESC').first
                  assert_equal 'jsmith', entry.user.login
                  assert_nil entry.issue
                  assert_equal Project.find(1), entry.project
                  assert_equal Date.parse('2010-12-02'), entry.spent_on
                  assert_equal 3.5, entry.hours
                  assert_equal TimeEntryActivity.find(11), entry.activity
                end
                test "POST /time_entries.xml with invalid parameters should return errors" do
                  assert_no_difference 'TimeEntry.count' do
                    post '/time_entries.xml', {:time_entry => {:project_id => '1', :spent_on => '2010-12-02', :activity_id => '11'}}, credentials('jsmith')
                  end
                  assert_response :unprocessable_entity
                  assert_equal 'application/xml', @response.content_type
                  assert_select 'errors error', :text => "Hours cannot be blank"
                end
                test "PUT /time_entries/:id.xml with valid parameters should update time entry" do
                  assert_no_difference 'TimeEntry.count' do
                    put '/time_entries/2.xml', {:time_entry => {:comments => 'API Update'}}, credentials('jsmith')
                  end
                  assert_response :ok
                  assert_equal '', @response.body
                  assert_equal 'API Update', TimeEntry.find(2).comments
                end
                test "PUT /time_entries/:id.xml with invalid parameters should return errors" do
                  assert_no_difference 'TimeEntry.count' do
                    put '/time_entries/2.xml', {:time_entry => {:hours => '', :comments => 'API Update'}}, credentials('jsmith')
                  end
                  assert_response :unprocessable_entity
                  assert_equal 'application/xml', @response.content_type
                  assert_select 'errors error', :text => "Hours cannot be blank"
                end
                test "DELETE /time_entries/:id.xml should destroy time entry" do
                  assert_difference 'TimeEntry.count', -1 do
                    delete '/time_entries/2.xml', {}, credentials('jsmith')
                  end
                  assert_response :ok
                  assert_equal '', @response.body
                  assert_nil TimeEntry.find_by_id(2)
                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