summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorEric Davis <edavis@littlestreamsoftware.com>2009-10-21 22:34:45 +0000
committerEric Davis <edavis@littlestreamsoftware.com>2009-10-21 22:34:45 +0000
commit5833ba9f81f0384e5b7f5a9d322adb1c5199e3d8 (patch)
tree90e628e7ff9b2fe4948fdd56546470e43d49455e /lib
parente615266e9a036811c7f73a471ba48b5bbe27adfe (diff)
downloadredmine-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 'lib')
-rw-r--r--lib/redmine.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 76518802f..ed227fddf 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -59,6 +59,7 @@ Redmine::AccessControl.map do |map|
map.permission :view_time_entries, :timelog => [:details, :report]
map.permission :edit_time_entries, {:timelog => [:edit, :destroy]}, :require => :member
map.permission :edit_own_time_entries, {:timelog => [:edit, :destroy]}, :require => :loggedin
+ map.permission :manage_project_activities, {:projects => [:save_activities, :reset_activities]}, :require => :member
end
map.project_module :news do |map|