kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,282 Commits 2 Branches 91 Tags 22 MiB
Commit Graph

61 Commits

Author SHA1 Message Date
Toshi MARUYAMA 098fabd6ce add function of bulk delete time entries (#7996). 
Contributed by Adam Soltys.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5316 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-04 11:54:47 +00:00
Toshi MARUYAMA 8a31517288 add bulk edit and bulk update actions for time entries (#7996). 
get bulk edit form action working by mapping permissions.

Contributed by Adam Soltys.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5313 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-04 11:53:29 +00:00
Jean-Philippe Lang 0786b9ef99 Replaces TimeEntry.visible_by with a visible scope. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5149 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-03-16 17:29:30 +00:00
Jean-Philippe Lang 335f8da5e8 Fixed: 404 when entering time with blank issue id (#7099). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4511 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-14 18:29:24 +00:00
Jean-Philippe Lang 224921460a Adds a pseudo format to api template names and overrides ActionController#default_template so that api templates are chosen automatically. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4466 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-04 17:43:39 +00:00
Jean-Philippe Lang 37ed02553a Fixes test failure in r4461. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4462 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-04 10:40:44 +00:00
Jean-Philippe Lang f7cf8aa878 Adds REST API for TimeEntries (#6823). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4461 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-12-04 10:13:15 +00:00
Jean-Philippe Lang 3ba3c540fb Prevents NoMethodError when requesting /time_entries/edit without an id (#6904). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4410 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-16 20:27:45 +00:00
Eric Davis 718816c5d4 Refactor: convert timelogs to a REST resource (:time_entries) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4250 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-12 15:55:21 +00:00
Eric Davis 435c90eb47 Refactor: extract TimelogController#edit to #update 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4248 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-11 15:31:42 +00:00
Eric Davis 4acd990ee2 Refactor: extract TimelogController#create from TimelogController#edit 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4244 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-08 15:39:39 +00:00
Eric Davis 068771ea07 Refactor: extract TimelogController#new from #edit 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4239 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-07 15:51:09 +00:00
Eric Davis 2ecca7e4df Refactor: rename TimelogController#details to #index 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4235 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-06 18:23:45 +00:00
Eric Davis e13790c62c Refactor: extract TimelogController#report to a new controller class 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4232 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-05 16:07:17 +00:00
Eric Davis cdfc57d544 Change the TimelogController's to/from dates based on the project time entries 
Instead of looking for the earliest and latest time entry system wide for the
dates in the form, now TimelogController will only look at the time entries
for the current project (and parent/sub projects).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4087 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-14 19:02:25 +00:00
Eric Davis 8900797ada Refactor: move method to Model. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4086 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-09-14 19:02:20 +00:00
Eric Davis 424b482579 Refactor TimelogController#report's joins and provide a hook to add more. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3931 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-08-09 23:15:32 +00:00
Eric Davis bd1384db7d Added hook :controller_timelog_available_criterias 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3826 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-07-01 18:49:25 +00:00
Eric Davis 11ff334cd8 Refactor: extract @available_criterias to utility method. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3825 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-07-01 18:47:25 +00:00
Eric Davis c98f46d691 Handle unsuccessful destroys in TimelogController. #5700 
Contributed by Jan

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3805 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-06-20 19:30:51 +00:00
Jean-Philippe Lang 8e3d1b694a Adds subtasking (#443) including: 
* priority, start/due dates, progress, estimate, spent time roll-up to parent issues
* descendant issues tree displayed on the issue view with context menu support
* issue tree display on the gantt chart
* issue tree copy on project copy
* unlimited nesting

Defining subtasks requires the new permission 'Manage subtasks'.
Subtasks can not belong to a different project than the parent task.

Implementation is based on scoped nested sets for fast reads and updates.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3573 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-03-13 14:56:49 +00:00
Jean-Philippe Lang 488c192286 Removes "xxx and return" calls (#4446). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3185 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-12-18 14:22:18 +00:00
Jean-Philippe Lang 6245f49934 Fixed: Pre-filled time tracking date ignores timezone (#4160). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3012 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-11-06 19:41:03 +00:00
Jean-Philippe Lang 7b77301eab Fixed: first day of date range is not included in time report with SQLite (#3112). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3009 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-11-04 17:35:20 +00:00
Jean-Philippe Lang 27e3fa2bed Use FasterCSV or ruby1.9 CSV instead of ruby1.8 builtin CSV. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3007 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-11-04 13:22:26 +00:00
Eric Davis 2e0cbd2840 Added all list and boolean custom data fields to the Time Report. #4077 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2951 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-21 22:34:57 +00:00
Jean-Philippe Lang 41cbd239c4 Makes timelog report work at issue level (#2935). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2893 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-09-20 09:30:41 +00:00
Eric Davis 62e58f26b0 Changed Enumerations to use a Single Table Inheritance 
* Added migrations to change Enumerations to an STI relationship
* Added TimeEntryActivity model (STI)
* Added DocumentCategory model (STI)
* Added IssuePriority model (STI)
* Added Enumeration#get_subclasses to get a list of the subclasses of Enumeration
* Changed Enumeration to use the STI type field instead of the opt field
* Changed Enumeration#opt to return the old opt values but with a deprecation warning.
* Removed Enumeration::OPTIONS
* Removed the dynamic named_scopes in favor of specific named_scopes.  Kept for
  compatibility reasons.
* Added Enumeration#default so each subclass can easily find it's default record.
* Fixed Enumeration#default to use the STI scoping with a fake default scope for finding Enumeration's default.
* Added a 'all' named scope for getting all records in order by position.
* Added Deprecation warnings to the old named_scopes in Enumerations.
* Moved various methods off of Enumeration and onto the concrete classes
* Changed the EnumerationsController to use types
* Updated the Enumeration list template
* Added has_many relationships to the Enumeration STI classes.
* Fixes for tests.

  #3007

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2777 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-05-30 23:30:36 +00:00
Eric Davis 211b13c9ec Added plugin hook, :controller_timelog_edit_before_save. (#3341) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2775 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-05-30 22:49:39 +00:00
Jean-Philippe Lang 5c97a83a70 Validates sort_key and sort_order params (#2378). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2171 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-12-24 10:03:13 +00:00
Jean-Philippe Lang 8a356baf3e Unescape back_url param before calling redirect_to. 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1893 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-09-21 12:45:22 +00:00
Jean-Philippe Lang 696d21f8c8 Adds cross-project time reports support (#994). 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1778 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-08-31 16:34:54 +00:00
Jean-Philippe Lang 2fdf4426cd Moves @layout 'base'@ to ApplicationController. 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1727 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-08-10 15:22:54 +00:00
Jean-Philippe Lang a17b62b455 Fixes hard-coded table names in queries. 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1692 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-07-22 19:07:43 +00:00
Jean-Philippe Lang d84d38983a Adds boolean and list custom fields for time entries as criteria on timelog report. 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1691 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-07-22 19:06:13 +00:00
Jean-Philippe Lang 1424b0f215 Addq "please select" to activity select box if no activity is set as default (#937). 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1602 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-06-29 12:01:20 +00:00
Jean-Philippe Lang ce6cf66f6c Custom fields refactoring: most of code moved from controllers to models (using new module ActsAsCustomizable). 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1592 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-06-27 20:13:56 +00:00
Jean-Philippe Lang f79f19f84c Fixed: timelog redirects inappropriately when :back_url is blank (#1524). 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1589 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-06-26 19:11:07 +00:00
Jean-Philippe Lang 062a2d6f5d Adds atom feed on time entries details (#1479). 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1560 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-06-17 20:01:15 +00:00
Jean-Philippe Lang 1a4f81163d Redirected user to where he is coming from after logging hours (#1062). 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1354 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-04-16 17:27:53 +00:00
Jean-Philippe Lang a3c89d4f69 Custom fields (list and boolean) can be used as criteria in time report (#1012). 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1340 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-04-09 17:45:39 +00:00
Jean-Philippe Lang 5d34548539 CSV export added to timelog report (#1009). 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1338 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-04-07 17:18:09 +00:00
Jean-Philippe Lang 4e961f44ef Various timelog report enhancements: 
* report can be done using days as columns (#993)
* add a total column to the time report
* replace upper-right links by tabs to switch between details and report
* preserve date range filter when switching between details and report


git-svn-id: http://redmine.rubyforge.org/svn/trunk@1326 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-04-05 16:40:26 +00:00
Jean-Philippe Lang 467f74510e Time report can be done at issue level (closes #970) + timelog views xhtml validation. 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1319 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-04-01 22:42:10 +00:00
Jean-Philippe Lang 043cb37b16 Add predefined date ranges to the time report in the same way as the details view (closes #972). It nows defaults to 'All time'. 
This patch also fixes time report periods (columns) computation.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1318 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-04-01 19:40:40 +00:00
Jean-Philippe Lang 8960200409 If 'Display subprojects issues on main projects' is set to false: 
* do not include subprojects in the issue count of the parent project overview (#939)
* do not include subproject timelogs on the parent project (#848)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1298 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-03-27 18:22:12 +00:00
Jean-Philippe Lang a8fcf8487d Add a time tracking block for 'My page' (#615). 
It lists current user's time entries for the last 7 days across all projects, grouped by day with subtotals for each day, and a grand total.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1260 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-03-16 12:21:54 +00:00
Jean-Philippe Lang 993b60d61e Adds 2 permissions (closes #859): 
* edit_time_entries: lets a user edit/delete any time entry
* edit_own_time_entries: lets a user edit/delete its own time entries only

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1249 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-03-14 21:17:09 +00:00
Jean-Philippe Lang 200842ba5e Propagates time tracking to the parent project (closes #433). Time report enhancements. 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1176 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-02-27 20:50:19 +00:00
Jean-Philippe Lang 328df74dd1 Adds date range filter and pagination on time entries detail view (closes #434). 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1173 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-02-26 18:15:58 +00:00