diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2009-10-21 22:34:45 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2009-10-21 22:34:45 +0000 |
| commit | 5833ba9f81f0384e5b7f5a9d322adb1c5199e3d8 (patch) | |
| tree | 90e628e7ff9b2fe4948fdd56546470e43d49455e /config | |
| parent | e615266e9a036811c7f73a471ba48b5bbe27adfe (diff) | |
| download | redmine-5833ba9f81f0384e5b7f5a9d322adb1c5199e3d8.tar.gz redmine-5833ba9f81f0384e5b7f5a9d322adb1c5199e3d8.zip | |
Added a Activities tab to Project Settings
* 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
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 1 | ||||
| -rw-r--r-- | config/routes.rb | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 8a07c644a..936692926 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -830,3 +830,4 @@ en: enumeration_issue_priorities: Issue priorities enumeration_doc_categories: Document categories enumeration_activities: Activities (time tracking) + enumeration_system_activity: System Activity diff --git a/config/routes.rb b/config/routes.rb index 3b790af14..f3c25a791 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -200,6 +200,11 @@ ActionController::Routing::Routes.draw do |map| project_actions.connect 'projects/:id/files/new', :action => 'add_file' project_actions.connect 'projects/:id/versions/new', :action => 'add_version' project_actions.connect 'projects/:id/categories/new', :action => 'add_issue_category' + project_actions.connect 'projects/:id/activities/save', :action => 'save_activities' + end + + projects.with_options :conditions => {:method => :delete} do |project_actions| + project_actions.conditions 'projects/:id/reset_activities', :action => 'reset_activities' end end |