summaryrefslogtreecommitdiffstats
path: root/test/functional/timelog_controller_test.rb
Commit message (Collapse)AuthorAgeFilesLines
* Merged r9740 and r9741 from trunk.Jean-Philippe Lang2012-06-031-3/+16
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9754 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Display of multi custom fields.Jean-Philippe Lang2012-01-291-0/+12
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8726 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed that project is ignored when entering an issue id on /time_entries/new ↵Jean-Philippe Lang2012-01-221-0/+14
| | | | | | form (#10020). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8693 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Enable global time logging at /time_entries/new (#10020).Jean-Philippe Lang2012-01-211-1/+95
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8691 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds a 'Create and continue' button on the spent time form (#9995).Jean-Philippe Lang2012-01-211-0/+22
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8687 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Separated new/edit views for the timelog controller.Jean-Philippe Lang2012-01-101-2/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8628 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Additional tests for TimelogController and added missing i18n string.Jean-Philippe Lang2011-12-171-0/+78
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8263 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Removed unnecessary calculations in time entries index.Jean-Philippe Lang2011-12-041-5/+5
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8085 e93f8b46-1217-0410-a6f0-8f06a7374b81
* add tests to export time log csv in Traditional Chinese and French for csv ↵Toshi MARUYAMA2011-11-271-0/+70
| | | | | | separator (#8368) git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7944 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed that :edit_time_entries permission allows creating time entries (#9405).Jean-Philippe Lang2011-11-241-0/+12
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7921 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed that :view_time_entries permission allows time entry editing (#9405).Jean-Philippe Lang2011-11-241-0/+11
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7920 e93f8b46-1217-0410-a6f0-8f06a7374b81
* fix malformed time log csv encoding in case of unable to convert (#8549)Toshi MARUYAMA2011-11-161-0/+46
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7819 e93f8b46-1217-0410-a6f0-8f06a7374b81
* add functional test to export time log csv encoded in Big5 on Traditional ↵Toshi MARUYAMA2011-11-151-0/+39
| | | | | | Chinese locale (#8549) git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7812 e93f8b46-1217-0410-a6f0-8f06a7374b81
* code layout clean up test/functional/timelog_controller_test.rbToshi MARUYAMA2011-11-101-1/+4
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7762 e93f8b46-1217-0410-a6f0-8f06a7374b81
* remove trailing white-spaces from test/functional/timelog_controller_test.rb.Toshi MARUYAMA2011-08-251-27/+26
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6624 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Code cleanup.Jean-Philippe Lang2011-04-051-7/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5319 e93f8b46-1217-0410-a6f0-8f06a7374b81
* add functional tests for bulk edit time entries (#7996).Toshi MARUYAMA2011-04-041-4/+75
| | | | | | Contributed by Adam Soltys. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5315 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Changed timelogs filters to use non-AJAX requests (#1965).Jean-Philippe Lang2011-04-031-4/+18
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5297 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed: 404 when entering time with blank issue id (#7099).Jean-Philippe Lang2010-12-141-0/+20
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4511 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Use absolute paths in test/**/* requires for Ruby 1.9.2 compatibility. #4050Jean-Baptiste Barth2010-12-121-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4509 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Refactor: convert timelogs to a REST resource (:time_entries)Eric Davis2010-10-121-3/+3
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4250 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Refactor: extract TimelogController#edit to #updateEric Davis2010-10-111-2/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4248 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Refactor: extract TimelogController#create from TimelogController#editEric Davis2010-10-081-2/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4244 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Refactor: extract TimelogController#new from #editEric Davis2010-10-071-11/+11
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4239 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Refactor: rename TimelogController#details to #indexEric Davis2010-10-061-28/+28
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4235 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Refactor: extract TimelogController#report to a new controller classEric Davis2010-10-051-127/+0
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4232 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Change the TimelogController's to/from dates based on the project time entriesEric Davis2010-09-141-3/+3
| | | | | | | | 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
* Handle unsuccessful destroys in TimelogController. #5700Eric Davis2010-06-201-0/+18
| | | | | | Contributed by Jan git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3805 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Refactor: Move the rest of the routing tests to RoutingTest.Eric Davis2010-04-211-105/+0
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3687 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed: first day of date range is not included in time report with SQLite ↵Jean-Philippe Lang2009-11-041-0/+16
| | | | | | (#3112). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3009 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Added all list and boolean custom data fields to the Time Report. #4077Eric Davis2009-10-211-2/+4
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2951 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Added an active field track if an Enumeration is active on the frontend view.Eric Davis2009-10-211-0/+23
| | | | | | | | | | | * Changed TimelogHelper#activity_collection_for_select_options to only use active TimeEntryActivities. * Changed TimelogHelper#activity_collection_for_select_options to return a blank option if the time_entry's current activity is inactive. #4077 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2946 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Makes timelog report work at issue level (#2935).Jean-Philippe Lang2009-09-201-0/+8
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2893 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Upgraded to Rails 2.3.4 (#3597)Eric Davis2009-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Ran the Rails upgrade * Upgraded to Rails Engines 2.3.2 * Added a plugin to let Engines override application views. * Converted tests to use the new classes: ** ActionController::TestCase for functional ** ActiveSupport::TestCase for units * Converted ActiveRecord::Error message to a string. * ActiveRecord grouping returns an ordered hash which doesn't have #sort! * Updated the I18n storage_units format. * Added some default initializers from a fresh rails app * Changed the order of check_box_tags and hidden_field_tags. The hidden tag needs to appear first in Rails 2.3, otherwise it will override any value in the check_box_tag. * Removed the custom handler for when the cookie store is tampered with. Rails 2.3 removed the TamperedWithCookie exception and instead Rails will not load the data from it when it's been tampered with (e.g. no user login). * Fixed mail layouts, 2.3 has problems with implicit multipart emails that use layouts. Also removed some custom Redmine mailer code. * Fixed a bug that occurred in tests where the "required" span tag would be added to the :field_status translation. This resulted in an email string of: <li>Status<span class="required"> *</span><span class="required"> *</span> Instead of: <li>Status: New</li> git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2887 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Allows multiple roles on the same project (#706). Prerequisite for user ↵Jean-Philippe Lang2009-05-101-1/+1
| | | | | | groups feature. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2726 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2.Jean-Philippe Lang2009-02-211-0/+2
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixes broken action url on time edit form (#2707).Jean-Philippe Lang2009-02-101-0/+9
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2434 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Converted routing and urls to follow the Rails REST convention.Eric Davis2009-01-261-6/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch supplied by commits from Gerrit Kaiser on Github. Existing routes will still work (backwards compatible) but any new urls will be generated using the new routing rules. Changes listed below: * made the URLs for some project tabs and project settings follow the new rails RESTful conventions of /collection/:id/subcollection/:sub_id * prettier URL for project roadmap * more nice project URLs * use GET for filtering form * prettified URLs used on issues tab * custom route for activity atom feeds * prettier repository urls * fixed broken route definition * fixed failing tests for issuecontroller that were hardcoding the url string * more RESTful routes for boards and messages * RESTful routes for wiki pages * RESTful routes for documents * moved old routes that are retained for compatibility to the bottom and grouped them together * added RESTful URIs for issues * RESTfulness for the news section * fixed route order * changed hardcoded URLs in tests * fixed badly written tests * fixed forgotten parameter in routes * changed hardcoded URLS to new scheme * changed project add url to the standard POST to collection * create new issue by POSTing to collection * changed hardcoded URLs in integrations tests * made project add form work again * restful routes for project deletion * prettier routes for project (un)archival * made routes table more readable * fixed note quoting * user routing * fixed bug * always sort by GET * Fixed: cross-project issue list should not show issues of projects for which the issue tracking module was disabled. * prettified URLs used on issues tab * urls for time log * fixed reply routing * eliminate revision query paremeter for diff and entry actions * fixed test failures with hard-coded urls * ensure ajax links always use get * refactored ajax link generation into separate method #1901 git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2317 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Slight changes in functional tests.Jean-Philippe Lang2009-01-041-1/+1
| | | | git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2235 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds cross-project time reports support (#994).Jean-Philippe Lang2008-08-311-2/+52
| | | | git-svn-id: http://redmine.rubyforge.org/svn/trunk@1778 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds atom feed on time entries details (#1479).Jean-Philippe Lang2008-06-171-0/+8
| | | | git-svn-id: http://redmine.rubyforge.org/svn/trunk@1560 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed: time entries created with the default activity even if a different ↵Jean-Philippe Lang2008-06-141-1/+3
| | | | | | one is specified (#1302). git-svn-id: http://redmine.rubyforge.org/svn/trunk@1533 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed: IssueController#edit doesn't set default Activity as default (#1302).Jean-Philippe Lang2008-05-261-1/+11
| | | | git-svn-id: http://redmine.rubyforge.org/svn/trunk@1461 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Custom fields (list and boolean) can be used as criteria in time report (#1012).Jean-Philippe Lang2008-04-091-2/+19
| | | | git-svn-id: http://redmine.rubyforge.org/svn/trunk@1340 e93f8b46-1217-0410-a6f0-8f06a7374b81
* CSV export added to timelog report (#1009).Jean-Philippe Lang2008-04-071-1/+12
| | | | git-svn-id: http://redmine.rubyforge.org/svn/trunk@1338 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Various timelog report enhancements:Jean-Philippe Lang2008-04-051-6/+15
| | | | | | | | | | * 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
* Time report can be done at issue level (closes #970) + timelog views xhtml ↵Jean-Philippe Lang2008-04-011-1/+1
| | | | | | validation. git-svn-id: http://redmine.rubyforge.org/svn/trunk@1319 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Add predefined date ranges to the time report in the same way as the details ↵Jean-Philippe Lang2008-04-011-5/+13
| | | | | | | | 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
* Add NewsController and TimelogController tests.Jean-Philippe Lang2008-03-171-0/+8
| | | | git-svn-id: http://redmine.rubyforge.org/svn/trunk@1270 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds 2 permissions (closes #859):Jean-Philippe Lang2008-03-141-1/+44
| | | | | | | * 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