##// END OF EJS Templates
Moves password param to user hash param so that it can be set using the User API....
Moves password param to user hash param so that it can be set using the User API. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4493 e93f8b46-1217-0410-a6f0-8f06a7374b81

File last commit:

r4352:224921460a0a
r4379:cde02954c845
Show More
timelog_controller.rb
272 lines | 10.2 KiB | text/x-ruby | RubyLexer
/ app / controllers / timelog_controller.rb
Jean-Philippe Lang
Adds REST API for TimeEntries (#6823)....
r4347 # Redmine - project management software
# Copyright (C) 2006-2010 Jean-Philippe Lang
Jean-Philippe Lang
Added time report....
r569 #
# 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.
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 class TimelogController < ApplicationController
Jean-Philippe Lang
Highlight the current item of the main menu....
r1062 menu_item :issues
Jean-Philippe Lang
Prevents NoMethodError when requesting /time_entries/edit without an id (#6904)....
r4296 before_filter :find_project, :only => [:new, :create]
Jean-Philippe Lang
Adds REST API for TimeEntries (#6823)....
r4347 before_filter :find_time_entry, :only => [:show, :edit, :update, :destroy]
Jean-Philippe Lang
Prevents NoMethodError when requesting /time_entries/edit without an id (#6904)....
r4296 before_filter :authorize, :except => [:index]
Eric Davis
Refactor: rename TimelogController#details to #index...
r4121 before_filter :find_optional_project, :only => [:index]
Jean-Philippe Lang
Adds REST API for TimeEntries (#6823)....
r4347 accept_key_auth :index, :show, :create, :update, :destroy
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 helper :sort
include SortHelper
Jean-Philippe Lang
Performance improvement on calendar and gantt (about 45% on gantt for large number of issues)....
r783 helper :issues
Jean-Philippe Lang
Adds date range filter and pagination on time entries detail view (closes #434)....
r1159 include TimelogHelper
Jean-Philippe Lang
Custom fields (list and boolean) can be used as criteria in time report (#1012)....
r1325 helper :custom_fields
include CustomFieldsHelper
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365
Eric Davis
Refactor: rename TimelogController#details to #index...
r4121 def index
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 sort_init 'spent_on', 'desc'
Jean-Philippe Lang
Validates sort_key and sort_order params (#2378)....
r2169 sort_update 'spent_on' => 'spent_on',
'user' => 'user_id',
'activity' => 'activity_id',
'project' => "#{Project.table_name}.name",
'issue' => 'issue_id',
'hours' => 'hours'
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 cond = ARCondition.new
Jean-Philippe Lang
Adds cross-project time reports support (#994)....
r1777 if @project.nil?
cond << Project.allowed_to_condition(User.current, :view_time_entries)
elsif @issue.nil?
cond << @project.project_condition(Setting.display_subprojects_issues?)
else
Jean-Philippe Lang
Adds subtasking (#443) including:...
r3459 cond << "#{Issue.table_name}.root_id = #{@issue.root_id} AND #{Issue.table_name}.lft >= #{@issue.lft} AND #{Issue.table_name}.rgt <= #{@issue.rgt}"
Jean-Philippe Lang
Adds cross-project time reports support (#994)....
r1777 end
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162
Jean-Philippe Lang
Add predefined date ranges to the time report in the same way as the details view (closes #972). It nows defaults to 'All time'....
r1303 retrieve_date_range
Jean-Philippe Lang
Various timelog report enhancements:...
r1311 cond << ['spent_on BETWEEN ? AND ?', @from, @to]
Jean-Philippe Lang
Adds date range filter and pagination on time entries detail view (closes #434)....
r1159
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 TimeEntry.visible_by(User.current) do
respond_to do |format|
format.html {
# Paginate results
Jean-Philippe Lang
Adds subtasking (#443) including:...
r3459 @entry_count = TimeEntry.count(:include => [:project, :issue], :conditions => cond.conditions)
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 @entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
@entries = TimeEntry.find(:all,
:include => [:project, :activity, :user, {:issue => :tracker}],
:conditions => cond.conditions,
:order => sort_clause,
:limit => @entry_pages.items_per_page,
:offset => @entry_pages.current.offset)
Jean-Philippe Lang
Adds subtasking (#443) including:...
r3459 @total_hours = TimeEntry.sum(:hours, :include => [:project, :issue], :conditions => cond.conditions).to_f
Jean-Philippe Lang
Various timelog report enhancements:...
r1311
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 render :layout => !request.xhr?
}
Jean-Philippe Lang
Adds REST API for TimeEntries (#6823)....
r4347 format.api {
@entry_count = TimeEntry.count(:include => [:project, :issue], :conditions => cond.conditions)
@entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
@entries = TimeEntry.find(:all,
:include => [:project, :activity, :user, {:issue => :tracker}],
:conditions => cond.conditions,
:order => sort_clause,
:limit => @entry_pages.items_per_page,
:offset => @entry_pages.current.offset)
}
Jean-Philippe Lang
Adds atom feed on time entries details (#1479)....
r1546 format.atom {
entries = TimeEntry.find(:all,
:include => [:project, :activity, :user, {:issue => :tracker}],
:conditions => cond.conditions,
:order => "#{TimeEntry.table_name}.created_on DESC",
:limit => Setting.feeds_limit.to_i)
render_feed(entries, :title => l(:label_spent_time))
}
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 format.csv {
# Export all entries
@entries = TimeEntry.find(:all,
:include => [:project, :activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
:conditions => cond.conditions,
:order => sort_clause)
Jean-Philippe Lang
Use FasterCSV or ruby1.9 CSV instead of ruby1.8 builtin CSV....
r2893 send_data(entries_to_csv(@entries), :type => 'text/csv; header=present', :filename => 'timelog.csv')
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 }
end
Jean-Philippe Lang
Adds date range filter and pagination on time entries detail view (closes #434)....
r1159 end
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 end
Jean-Philippe Lang
Adds REST API for TimeEntries (#6823)....
r4347
def show
respond_to do |format|
# TODO: Implement html response
format.html { render :nothing => true, :status => 406 }
Jean-Philippe Lang
Adds a pseudo format to api template names and overrides ActionController#default_template so that api templates are chosen automatically....
r4352 format.api
Jean-Philippe Lang
Adds REST API for TimeEntries (#6823)....
r4347 end
end
Eric Davis
Refactor: extract TimelogController#new from #edit...
r4125
def new
@time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
@time_entry.attributes = params[:time_entry]
call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
render :action => 'edit'
end
Eric Davis
Refactor: extract TimelogController#create from TimelogController#edit...
r4130
verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
def create
@time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => User.current.today)
@time_entry.attributes = params[:time_entry]
call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
if @time_entry.save
Jean-Philippe Lang
Adds REST API for TimeEntries (#6823)....
r4347 respond_to do |format|
format.html {
flash[:notice] = l(:notice_successful_update)
redirect_back_or_default :action => 'index', :project_id => @time_entry.project
}
Jean-Philippe Lang
Adds a pseudo format to api template names and overrides ActionController#default_template so that api templates are chosen automatically....
r4352 format.api { render :action => 'show', :status => :created, :location => time_entry_url(@time_entry) }
Jean-Philippe Lang
Adds REST API for TimeEntries (#6823)....
r4347 end
Eric Davis
Refactor: extract TimelogController#create from TimelogController#edit...
r4130 else
Jean-Philippe Lang
Adds REST API for TimeEntries (#6823)....
r4347 respond_to do |format|
format.html { render :action => 'edit' }
format.api { render_validation_errors(@time_entry) }
end
Eric Davis
Refactor: extract TimelogController#create from TimelogController#edit...
r4130 end
end
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365
def edit
Eric Davis
Refactor: extract TimelogController#edit to #update...
r4134 @time_entry.attributes = params[:time_entry]
call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
end
verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
def update
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 @time_entry.attributes = params[:time_entry]
Eric Davis
Added plugin hook, :controller_timelog_edit_before_save. (#3341)...
r2675
call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
Eric Davis
Refactor: extract TimelogController#edit to #update...
r4134 if @time_entry.save
Jean-Philippe Lang
Adds REST API for TimeEntries (#6823)....
r4347 respond_to do |format|
format.html {
flash[:notice] = l(:notice_successful_update)
redirect_back_or_default :action => 'index', :project_id => @time_entry.project
}
format.api { head :ok }
end
Eric Davis
Refactor: extract TimelogController#edit to #update...
r4134 else
Jean-Philippe Lang
Adds REST API for TimeEntries (#6823)....
r4347 respond_to do |format|
format.html { render :action => 'edit' }
format.api { render_validation_errors(@time_entry) }
end
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 end
end
Eric Davis
Refactor: extract TimelogController#edit to #update...
r4134
Eric Davis
Refactor: convert timelogs to a REST resource (:time_entries)...
r4136 verify :method => :delete, :only => :destroy, :render => {:nothing => true, :status => :method_not_allowed }
Jean-Philippe Lang
Adds 2 permissions (closes #859):...
r1235 def destroy
Eric Davis
Handle unsuccessful destroys in TimelogController. #5700...
r3691 if @time_entry.destroy && @time_entry.destroyed?
Jean-Philippe Lang
Adds REST API for TimeEntries (#6823)....
r4347 respond_to do |format|
format.html {
flash[:notice] = l(:notice_successful_delete)
redirect_to :back
}
format.api { head :ok }
end
Eric Davis
Handle unsuccessful destroys in TimelogController. #5700...
r3691 else
Jean-Philippe Lang
Adds REST API for TimeEntries (#6823)....
r4347 respond_to do |format|
format.html {
Jean-Philippe Lang
Fixes test failure in r4461....
r4348 flash[:error] = l(:notice_unable_delete_time_entry)
Jean-Philippe Lang
Adds REST API for TimeEntries (#6823)....
r4347 redirect_to :back
}
format.api { render_validation_errors(@time_entry) }
end
Eric Davis
Handle unsuccessful destroys in TimelogController. #5700...
r3691 end
Jean-Philippe Lang
Adds cross-project time reports support (#994)....
r1777 rescue ::ActionController::RedirectBackError
Eric Davis
Refactor: rename TimelogController#details to #index...
r4121 redirect_to :action => 'index', :project_id => @time_entry.project
Jean-Philippe Lang
Adds 2 permissions (closes #859):...
r1235 end
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365
private
Jean-Philippe Lang
Prevents NoMethodError when requesting /time_entries/edit without an id (#6904)....
r4296 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
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 def find_project
Jean-Philippe Lang
Adds REST API for TimeEntries (#6823)....
r4347 if issue_id = (params[:issue_id] || params[:time_entry] && params[:time_entry][:issue_id])
@issue = Issue.find(issue_id)
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 @project = @issue.project
Jean-Philippe Lang
Adds REST API for TimeEntries (#6823)....
r4347 elsif project_id = (params[:project_id] || params[:time_entry] && params[:time_entry][:project_id])
@project = Project.find(project_id)
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 else
render_404
return false
end
Jean-Philippe Lang
Adds 2 permissions (closes #859):...
r1235 rescue ActiveRecord::RecordNotFound
render_404
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 end
Jean-Philippe Lang
Add predefined date ranges to the time report in the same way as the details view (closes #972). It nows defaults to 'All time'....
r1303
Jean-Philippe Lang
Adds cross-project time reports support (#994)....
r1777 def find_optional_project
if !params[:issue_id].blank?
@issue = Issue.find(params[:issue_id])
@project = @issue.project
elsif !params[:project_id].blank?
@project = Project.find(params[:project_id])
end
deny_access unless User.current.allowed_to?(:view_time_entries, @project, :global => true)
end
Jean-Philippe Lang
Time report can be done at issue level (closes #970) + timelog views xhtml validation....
r1304 # Retrieves the date range based on predefined ranges or specific from/to param dates
Jean-Philippe Lang
Add predefined date ranges to the time report in the same way as the details view (closes #972). It nows defaults to 'All time'....
r1303 def retrieve_date_range
@free_period = false
@from, @to = nil, nil
if params[:period_type] == '1' || (params[:period_type].nil? && !params[:period].nil?)
case params[:period].to_s
when 'today'
@from = @to = Date.today
when 'yesterday'
@from = @to = Date.today - 1
when 'current_week'
@from = Date.today - (Date.today.cwday - 1)%7
@to = @from + 6
when 'last_week'
@from = Date.today - 7 - (Date.today.cwday - 1)%7
@to = @from + 6
when '7_days'
@from = Date.today - 7
@to = Date.today
when 'current_month'
@from = Date.civil(Date.today.year, Date.today.month, 1)
@to = (@from >> 1) - 1
when 'last_month'
@from = Date.civil(Date.today.year, Date.today.month, 1) << 1
@to = (@from >> 1) - 1
when '30_days'
@from = Date.today - 30
@to = Date.today
when 'current_year'
@from = Date.civil(Date.today.year, 1, 1)
@to = Date.civil(Date.today.year, 12, 31)
end
elsif params[:period_type] == '2' || (params[:period_type].nil? && (!params[:from].nil? || !params[:to].nil?))
begin; @from = params[:from].to_s.to_date unless params[:from].blank?; rescue; end
begin; @to = params[:to].to_s.to_date unless params[:to].blank?; rescue; end
@free_period = true
else
# default
end
@from, @to = @to, @from if @from && @to && @from > @to
Eric Davis
Change the TimelogController's to/from dates based on the project time entries...
r3973 @from ||= (TimeEntry.earilest_date_for_project(@project) || Date.today)
@to ||= (TimeEntry.latest_date_for_project(@project) || Date.today)
Jean-Philippe Lang
Add predefined date ranges to the time report in the same way as the details view (closes #972). It nows defaults to 'All time'....
r1303 end
Eric Davis
Refactor: extract @available_criterias to utility method....
r3711
Jean-Philippe Lang
Simple time tracking functionality added. Time can be logged at issue or project level....
r365 end