Skip to content

O
OHR Support
Switch branch/tag
  1. 29 Oct, 2009 6 commits
  3. 25 Oct, 2009 15 commits
  5. 24 Oct, 2009 11 commits
  7. 22 Oct, 2009 4 commits
  9. 21 Oct, 2009 4 commits
    • Eric Davis's avatar
      Fixed some merge bugs. #4077 · ff3d0fe4
      Eric Davis authored 
      git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2952 e93f8b46-1217-0410-a6f0-8f06a7374b81
      ff3d0fe4
    • Eric Davis's avatar
      Added all list and boolean custom data fields to the Time Report. #4077 · 2e0cbd28
      Eric Davis authored 
      git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2951 e93f8b46-1217-0410-a6f0-8f06a7374b81
      2e0cbd28
    • Eric Davis's avatar
      When a specific TimeEntryActivity are change, associated TimeEntries will be · 37d401ac
      Eric Davis authored 
      re-assigned to the correct record.

* Renamed build to create since the methods now create objects.
* Removed call to Project#save that isn't needed since objects are saved directly now.
* Wrapped the activity creation and updates in a SQL transaction so TimeEntries
  will remain in a consistent state if there is an error.
* When a Project's TimeEntryActivities are destroyed, they are now
  reassigned to the parent TimeEntryActivity.

  #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2950 e93f8b46-1217-0410-a6f0-8f06a7374b81
      37d401ac
    • Eric Davis's avatar
      Added a Activities tab to Project Settings · 5833ba9f
      Eric Davis authored 
      * Changed Project#activities to allow getting inactive Activities also:
  * Changed the Enumeration#all named_scope to exclude project specific Activities
  * Changed the Project has_many time_entry_activities to include all by default
    and provided an #active method to filter them to active ones only
  * Split Project#activities to two methods and gave it a parameter that is used
    to determine if inactive activities are included (default is no)
* Added a reset button to delete all project specific activities.
* Added ProjectsController#reset_activities to remove the project
  specific activities
* Added a HTTP DELETE route for reset_activities
* Changed the permissions for managing project activities to have access to the
  ProjectsController#reset_activities action
* Added a way to bulk save Project specific Activities in ProjectsController
  * #save_activities will save all the changed activities, including update the
    existing records
  * Added helper methods to the controller which will be refactored later
  * Allow the same TimeEntryActivity names on different projects

  #4077

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2949 e93f8b46-1217-0410-a6f0-8f06a7374b81
      5833ba9f