jro_apps/redmine Commit - r9607:7b7bca0b594f

Merged r9783 from trunk....

Jean-Philippe Lang -

r9607:7b7bca0b594f

parent child

Context file:

r9607:7b7bca0b594f

Collapse all files

app/models/time_entry.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2011  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
               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,
                             :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
               before_validation :set_project_if_nil
               validate :validate_time_entry
               named_scope :visible, lambda {|*args| {
                 :include => :project,
                 :conditions => Project.allowed_to_condition(args.shift || User.current, :view_time_entries, *args)
               }}
               named_scope :on_issue, lambda {|issue| {
                 :include => :issue,
                 :conditions => "#{Issue.table_name}.root_id = #{issue.root_id} AND #{Issue.table_name}.lft >= #{issue.lft} AND #{Issue.table_name}.rgt <= #{issue.rgt}"
               }}
               named_scope :on_project, lambda {|project, include_subprojects| {
                 :include => :project,
                 :conditions => project.project_condition(include_subprojects)
               }}
               named_scope :spent_between, lambda {|from, to|
                 if from && to
                  {:conditions => ["#{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", from, to]}
                 elsif from
                  {:conditions => ["#{TimeEntry.table_name}.spent_on >= ?", from]}
                 elsif to
                  {:conditions => ["#{TimeEntry.table_name}.spent_on <= ?", to]}
                 else
                  {}
                 end
               }
-              safe_attributes 'hours', 'comments', 'issue_id', 'activity_id', 'spent_on', 'custom_field_values'
+              safe_attributes 'hours', 'comments', '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 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
             end

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

             # Redmine - project management software
             # Copyright (C) 2006-2011  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 ApiTest::TimeEntriesTest < ActionController::IntegrationTest
               fixtures :projects, :trackers, :issue_statuses, :issues,
                        :enumerations, :users, :issue_categories,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :enabled_modules,
                        :workflows,
                        :time_entries
               def setup
                 Setting.rest_api_enabled = '1'
               end
               context "GET /time_entries.xml" do
                 should "return time entries" do
                   get '/time_entries.xml', {}, credentials('jsmith')
                   assert_response :success
                   assert_equal 'application/xml', @response.content_type
                   assert_tag :tag => 'time_entries',
                     :child => {:tag => 'time_entry', :child => {:tag => 'id', :content => '2'}}
                 end
                 context "with limit" do
                   should "return limited results" do
                     get '/time_entries.xml?limit=2', {}, credentials('jsmith')
                     assert_response :success
                     assert_equal 'application/xml', @response.content_type
                     assert_tag :tag => 'time_entries',
                       :children => {:count => 2}
                   end
                 end
               end
               context "GET /time_entries/2.xml" do
                 should "return requested time entry" do
                   get '/time_entries/2.xml', {}, credentials('jsmith')
                   assert_response :success
                   assert_equal 'application/xml', @response.content_type
                   assert_tag :tag => 'time_entry',
                     :child => {:tag => 'id', :content => '2'}
                 end
               end
               context "POST /time_entries.xml" do
                 context "with issue_id" do
                   should "return 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.first(:order => 'id DESC')
                     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
+                  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.first(:order => 'id DESC')
+                    assert_equal 'accepted', entry.custom_field_value(field)
+                  end
                 end
                 context "with project_id" do
                   should "return 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.first(:order => 'id DESC')
                     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
                 end
                 context "with invalid parameters" do
                   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_tag 'errors', :child => {:tag => 'error', :content => "Hours can't be blank"}
                   end
                 end
               end
               context "PUT /time_entries/2.xml" do
                 context "with valid parameters" do
                   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 'API Update', TimeEntry.find(2).comments
                   end
                 end
                 context "with invalid parameters" do
                   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_tag 'errors', :child => {:tag => 'error', :content => "Hours can't be blank"}
                   end
                 end
               end
               context "DELETE /time_entries/2.xml" do
                 should "destroy time entry" do
                   assert_difference 'TimeEntry.count', -1 do
                     delete '/time_entries/2.xml', {}, credentials('jsmith')
                   end
                   assert_response :ok
                   assert_nil TimeEntry.find_by_id(2)
                 end
               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