jro_apps/redmine Commit - r2835:5833ba9f81f0

Added a Activities tab to Project Settings...

Eric Davis -

r2835:5833ba9f81f0

parent child

Context file:

r2835:5833ba9f81f0

Collapse all files

app/views/projects/settings/_activities.rhtml created 644 +37 0

@@ -0,0 +1,37
	1	<% form_tag({:controller => 'projects', :action => 'save_activities', :id => @project}, :class => "tabular") do %>
	2
	3	<table class="list">
	4	<tr>
	5	<th><%= l(:field_name) %></th>
	6	<th><%= l(:enumeration_system_activity) %></th>
	7	<% TimeEntryActivity.new.available_custom_fields.each do \|value\| %>
	8	<th><%= h value.name %></th>
	9	<% end %>
	10	<th style="width:15%;"><%= l(:field_active) %></th>
	11	</tr>
	12
	13	<% @project.activities(true).each do \|enumeration\| %>
	14	<% fields_for "enumerations[#{enumeration.id}]", enumeration do \|ff\| %>
	15	<tr class="<%= cycle('odd', 'even') %>">
	16	<td>
	17	<%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %>
	18	<%= h(enumeration) %>
	19	</td>
	20	<td align="center" style="width:15%;"><%= image_tag('true.png') unless enumeration.project %></td>
	21	<% enumeration.custom_field_values.each do \|value\| %>
	22	<td align="center">
	23	<%= custom_field_tag "enumerations[#{enumeration.id}]", value %>
	24	</td>
	25	<% end %>
	26	<td align="center" style="width:15%;">
	27	<%= ff.check_box :active %>
	28	</td>
	29	</tr>
	30	<% end %>
	31	<% end %>
	32	</table>
	33
	34	<%= submit_tag l(:button_save) %>
	35	<% end %>
	36	<%= button_to l(:button_reset), {:controller => 'projects', :action => 'reset_activities', :id => @project}, :method => :delete, :confirm => l(:text_are_you_sure), :style => "position: relative; top: -20px; left: 60px;" %>
	37

app/controllers/projects_controller.rb +18 0

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class ProjectsController < ApplicationController
               menu_item :overview
               menu_item :activity, :only => :activity
               menu_item :roadmap, :only => :roadmap
               menu_item :files, :only => [:list_files, :add_file]
               menu_item :settings, :only => :settings
               menu_item :issues, :only => [:changelog]
               before_filter :find_project, :except => [ :index, :list, :add, :copy, :activity ]
               before_filter :find_optional_project, :only => :activity
               before_filter :authorize, :except => [ :index, :list, :add, :copy, :archive, :unarchive, :destroy, :activity ]
               before_filter :authorize_global, :only => :add
               before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
               accept_key_auth :activity
               after_filter :only => [:add, :edit, :archive, :unarchive, :destroy] do |controller|
                 if controller.request.post?
                   controller.send :expire_action, :controller => 'welcome', :action => 'robots.txt'
                 end
               end
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               helper :issues
               helper IssuesHelper
               helper :queries
               include QueriesHelper
               helper :repositories
               include RepositoriesHelper
               include ProjectsHelper
               # Lists visible projects
               def index
                 respond_to do |format|
                   format.html {
                     @projects = Project.visible.find(:all, :order => 'lft')
                   }
                   format.atom {
                     projects = Project.visible.find(:all, :order => 'created_on DESC',
                                                           :limit => Setting.feeds_limit.to_i)
                     render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
                   }
                 end
               end
               # Add a new project
               def add
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @trackers = Tracker.all
                 @project = Project.new(params[:project])
                 if request.get?
                   @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
                   @project.trackers = Tracker.all
                   @project.is_public = Setting.default_projects_public?
                   @project.enabled_module_names = Redmine::AccessControl.available_project_modules
                 else
                   @project.enabled_module_names = params[:enabled_modules]
                   if @project.save
                     @project.set_parent!(params[:project]['parent_id']) if User.current.admin? && params[:project].has_key?('parent_id')
                     # Add current user as a project member if he is not admin
                     unless User.current.admin?
                       r = Role.givable.find_by_id(Setting.new_project_user_role_id.to_i) || Role.givable.first
                       m = Member.new(:user => User.current, :roles => [r])
                       @project.members << m
                     end
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'projects', :action => 'settings', :id => @project
                   end
                 end
               end
               def copy
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @trackers = Tracker.all
                 @root_projects = Project.find(:all,
                                               :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
                                               :order => 'name')
                 if request.get?
                   @project = Project.copy_from(params[:id])
                   if @project
                     @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
                   else
                     redirect_to :controller => 'admin', :action => 'projects'
                   end
                 else
                   @project = Project.new(params[:project])
                   @project.enabled_module_names = params[:enabled_modules]
                   if @project.copy(params[:id])
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :controller => 'admin', :action => 'projects'
                   end
                 end
               end
               # Show @project
               def show
                 if params[:jump]
                   # try to redirect to the requested menu item
                   redirect_to_project_menu_item(@project, params[:jump]) && return
                 end
                 @users_by_role = @project.users_by_role
                 @subprojects = @project.children.visible
                 @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
                 @trackers = @project.rolled_up_trackers
                 cond = @project.project_condition(Setting.display_subprojects_issues?)
                 @open_issues_by_tracker = Issue.visible.count(:group => :tracker,
                                                         :include => [:project, :status, :tracker],
                                                         :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false])
                 @total_issues_by_tracker = Issue.visible.count(:group => :tracker,
                                                         :include => [:project, :status, :tracker],
                                                         :conditions => cond)
                 TimeEntry.visible_by(User.current) do
                   @total_hours = TimeEntry.sum(:hours,
                                                :include => :project,
                                                :conditions => cond).to_f
                 end
                 @key = User.current.rss_key
               end
               def settings
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @issue_category ||= IssueCategory.new
                 @member ||= @project.members.new
                 @trackers = Tracker.all
                 @repository ||= @project.repository
                 @wiki ||= @project.wiki
               end
               # Edit @project
               def edit
                 if request.post?
                   @project.attributes = params[:project]
                   if @project.save
                     @project.set_parent!(params[:project]['parent_id']) if User.current.admin? && params[:project].has_key?('parent_id')
                     flash[:notice] = l(:notice_successful_update)
                     redirect_to :action => 'settings', :id => @project
                   else
                     settings
                     render :action => 'settings'
                   end
                 end
               end
               def modules
                 @project.enabled_module_names = params[:enabled_modules]
                 redirect_to :action => 'settings', :id => @project, :tab => 'modules'
               end
               def archive
                 @project.archive if request.post? && @project.active?
                 redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
               end
               def unarchive
                 @project.unarchive if request.post? && !@project.active?
                 redirect_to(url_for(:controller => 'admin', :action => 'projects', :status => params[:status]))
               end
               # Delete @project
               def destroy
                 @project_to_destroy = @project
                 if request.post? and params[:confirm]
                   @project_to_destroy.destroy
                   redirect_to :controller => 'admin', :action => 'projects'
                 end
                 # hide project in layout
                 @project = nil
               end
               # Add a new issue category to @project
               def add_issue_category
                 @category = @project.issue_categories.build(params[:category])
                 if request.post? and @category.save
               	  respond_to do |format|
                     format.html do
                       flash[:notice] = l(:notice_successful_create)
                       redirect_to :action => 'settings', :tab => 'categories', :id => @project
                     end
                     format.js do
                       # IE doesn't support the replace_html rjs method for select box options
                       render(:update) {|page| page.replace "issue_category_id",
                         content_tag('select', '<option></option>' + options_from_collection_for_select(@project.issue_categories, 'id', 'name', @category.id), :id => 'issue_category_id', :name => 'issue[category_id]')
                       }
                     end
                   end
                 end
               end
               # Add a new version to @project
               def add_version
               	@version = @project.versions.build(params[:version])
               	if request.post? and @version.save
               	  flash[:notice] = l(:notice_successful_create)
                   redirect_to :action => 'settings', :tab => 'versions', :id => @project
               	end
               end
               def add_file
                 if request.post?
                   container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
                   attachments = attach_files(container, params[:attachments])
                   if !attachments.empty? && Setting.notified_events.include?('file_added')
                     Mailer.deliver_attachments_added(attachments)
                   end
                   redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                   return
                 end
                 @versions = @project.versions.sort
               end
+              def save_activities
+                if request.post? && params[:enumerations]
+                  params[:enumerations].each do |id, activity|
+                    @project.update_or_build_time_entry_activity(id, activity)
+                  end
+                  @project.save
+                end
+                redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
+              end
+              def reset_activities
+                @project.time_entry_activities.each do |time_entry_activity|
+                  time_entry_activity.destroy
+                end
+                redirect_to :controller => 'projects', :action => 'settings', :tab => 'activities', :id => @project
+              end
               def list_files
                 sort_init 'filename', 'asc'
                 sort_update 'filename' => "#{Attachment.table_name}.filename",
                             'created_on' => "#{Attachment.table_name}.created_on",
                             'size' => "#{Attachment.table_name}.filesize",
                             'downloads' => "#{Attachment.table_name}.downloads"
                 @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)]
                 @containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
                 render :layout => !request.xhr?
               end
               # Show changelog for @project
               def changelog
                 @trackers = @project.trackers.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
                 retrieve_selected_tracker_ids(@trackers)
                 @versions = @project.versions.sort
               end
               def roadmap
                 @trackers = @project.trackers.find(:all, :conditions => ["is_in_roadmap=?", true])
                 retrieve_selected_tracker_ids(@trackers)
                 @versions = @project.versions.sort
                 @versions = @versions.select {|v| !v.completed? } unless params[:completed]
               end
               def activity
                 @days = Setting.activity_days_default.to_i
                 if params[:from]
                   begin; @date_to = params[:from].to_date + 1; rescue; end
                 end
                 @date_to ||= Date.today + 1
                 @date_from = @date_to - @days
                 @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
                 @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
                 @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
                                                                          :with_subprojects => @with_subprojects,
                                                                          :author => @author)
                 @activity.scope_select {|t| !params["show_#{t}"].nil?}
                 @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
                 events = @activity.events(@date_from, @date_to)
                 respond_to do |format|
                   format.html {
                     @events_by_day = events.group_by(&:event_date)
                     render :layout => false if request.xhr?
                   }
                   format.atom {
                     title = l(:label_activity)
                     if @author
                       title = @author.name
                     elsif @activity.scope.size == 1
                       title = l("label_#{@activity.scope.first.singularize}_plural")
                     end
                     render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
                   }
                 end
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             private
               # Find project of id params[:id]
               # if not found, redirect to project list
               # Used as a before_filter
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_optional_project
                 return true unless params[:id]
                 @project = Project.find(params[:id])
                 authorize
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def retrieve_selected_tracker_ids(selectable_trackers)
                 if ids = params[:tracker_ids]
                   @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
                 else
                   @selected_tracker_ids = selectable_trackers.collect {|t| t.id.to_s }
                 end
               end
             end

app/helpers/projects_helper.rb +2 -1

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module ProjectsHelper
               def link_to_version(version, options = {})
                 return '' unless version && version.is_a?(Version)
                 link_to h(version.name), { :controller => 'versions', :action => 'show', :id => version }, options
               end
               def project_settings_tabs
                 tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural},
                         {:name => 'modules', :action => :select_project_modules, :partial => 'projects/settings/modules', :label => :label_module_plural},
                         {:name => 'members', :action => :manage_members, :partial => 'projects/settings/members', :label => :label_member_plural},
                         {:name => 'versions', :action => :manage_versions, :partial => 'projects/settings/versions', :label => :label_version_plural},
                         {:name => 'categories', :action => :manage_categories, :partial => 'projects/settings/issue_categories', :label => :label_issue_category_plural},
                         {:name => 'wiki', :action => :manage_wiki, :partial => 'projects/settings/wiki', :label => :label_wiki},
                         {:name => 'repository', :action => :manage_repository, :partial => 'projects/settings/repository', :label => :label_repository},
-                        {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural}
+                        {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural},
+                        {:name => 'activities', :action => :manage_project_activities, :partial => 'projects/settings/activities', :label => :enumeration_activities}
                         ]
                 tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}
               end
               def parent_project_select_tag(project)
                 options = '<option></option>' + project_tree_options_for_select(project.possible_parents, :selected => project.parent)
                 content_tag('select', options, :name => 'project[parent_id]')
               end
               # Renders a tree of projects as a nested set of unordered lists
               # The given collection may be a subset of the whole project tree
               # (eg. some intermediate nodes are private and can not be seen)
               def render_project_hierarchy(projects)
                 s = ''
                 if projects.any?
                   ancestors = []
                   projects.each do |project|
                     if (ancestors.empty? || project.is_descendant_of?(ancestors.last))
                       s << "<ul class='projects #{ ancestors.empty? ? 'root' : nil}'>\n"
                     else
                       ancestors.pop
                       s << "</li>"
                       while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
                         ancestors.pop
                         s << "</ul></li>\n"
                       end
                     end
                     classes = (ancestors.empty? ? 'root' : 'child')
                     s << "<li class='#{classes}'><div class='#{classes}'>" +
                            link_to(h(project), {:controller => 'projects', :action => 'show', :id => project}, :class => "project #{User.current.member_of?(project) ? 'my-project' : nil}")
                     s << "<div class='wiki description'>#{textilizable(project.short_description, :project => project)}</div>" unless project.description.blank?
                     s << "</div>\n"
                     ancestors << project
                   end
                   s << ("</li></ul>\n" * ancestors.size)
                 end
                 s
               end
             end

app/models/enumeration.rb +28 -2

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Enumeration < ActiveRecord::Base
               belongs_to :project
               acts_as_list :scope => 'type = \'#{type}\''
               acts_as_customizable
               acts_as_tree :order => 'position ASC'
               before_destroy :check_integrity
               validates_presence_of :name
-              validates_uniqueness_of :name, :scope => [:type]
+              validates_uniqueness_of :name, :scope => [:type, :project_id]
               validates_length_of :name, :maximum => 30
               # Backwards compatiblity named_scopes.
               # Can be removed post-0.9
               named_scope :priorities, :conditions => { :type => "IssuePriority" }, :order => 'position' do
                 ActiveSupport::Deprecation.warn("Enumeration#priorities is deprecated, use the IssuePriority class. (#{Redmine::Info.issue(3007)})")
                 def default
                   find(:first, :conditions => { :is_default => true })
                 end
               end
               named_scope :document_categories, :conditions => { :type => "DocumentCategory" }, :order => 'position' do
                 ActiveSupport::Deprecation.warn("Enumeration#document_categories is deprecated, use the DocumentCategories class. (#{Redmine::Info.issue(3007)})")
                 def default
                   find(:first, :conditions => { :is_default => true })
                 end
               end
               named_scope :activities, :conditions => { :type => "TimeEntryActivity" }, :order => 'position' do
                 ActiveSupport::Deprecation.warn("Enumeration#activities is deprecated, use the TimeEntryActivity class. (#{Redmine::Info.issue(3007)})")
                 def default
                   find(:first, :conditions => { :is_default => true })
                 end
               end
               named_scope :values, lambda {|type| { :conditions => { :type => type }, :order => 'position' } } do
                 def default
                   find(:first, :conditions => { :is_default => true })
                 end
               end
               # End backwards compatiblity named_scopes
-              named_scope :all, :order => 'position'
+              named_scope :all, :order => 'position', :conditions => { :project_id => nil }
               named_scope :active, lambda {
                 {
                   :conditions => {:active => true, :project_id => nil},
                   :order => 'position'
                 }
               }
               def self.default
                 # Creates a fake default scope so Enumeration.default will check
                 # it's type.  STI subclasses will automatically add their own
                 # types to the finder.
                 if self.descends_from_active_record?
                   find(:first, :conditions => { :is_default => true, :type => 'Enumeration' })
                 else
                   # STI classes are
                   find(:first, :conditions => { :is_default => true })
                 end
               end
               # Overloaded on concrete classes
               def option_name
                 nil
               end
               # Backwards compatiblity.  Can be removed post-0.9
               def opt
                 ActiveSupport::Deprecation.warn("Enumeration#opt is deprecated, use the STI classes now. (#{Redmine::Info.issue(3007)})")
                 return OptName
               end
               def before_save
                 if is_default? && is_default_changed?
                   Enumeration.update_all("is_default = #{connection.quoted_false}", {:type => type})
                 end
               end
               # Overloaded on concrete classes
               def objects_count
               end
               def in_use?
                 self.objects_count != 0
               end
               # Is this enumeration overiding a system level enumeration?
               def is_override?
                 !self.parent.nil?
               end
               alias :destroy_without_reassign :destroy
               # Destroy the enumeration
               # If a enumeration is specified, objects are reassigned
               def destroy(reassign_to = nil)
                 if reassign_to && reassign_to.is_a?(Enumeration)
                   self.transfer_relations(reassign_to)
                 end
                 destroy_without_reassign
               end
               def <=>(enumeration)
                 position <=> enumeration.position
               end
               def to_s; name end
               # Returns the Subclasses of Enumeration.  Each Subclass needs to be
               # required in development mode.
               #
               # Note: subclasses is protected in ActiveRecord
               def self.get_subclasses
                 @@subclasses[Enumeration]
               end
+              # Does the +new+ Hash override the previous Enumeration?
+              def self.overridding_change?(new, previous)
+                if (same_active_state?(new['active'], previous.active)) && same_custom_values?(new,previous)
+                  return false
+                else
+                  return true
+                end
+              end
+              # Does the +new+ Hash have the same custom values as the previous Enumeration?
+              def self.same_custom_values?(new, previous)
+                previous.custom_field_values.each do |custom_value|
+                  if custom_value.value != new["custom_field_values"][custom_value.custom_field_id.to_s]
+                    return false
+                  end
+                end
+                return true
+              end
+              # Are the new and previous fields equal?
+              def self.same_active_state?(new, previous)
+                new = (new == "1" ? true : false)
+                return new == previous
+              end
             private
               def check_integrity
                 raise "Can't delete enumeration" if self.in_use?
               end
             end
             # Force load the subclasses in development mode
             require_dependency 'time_entry_activity'
             require_dependency 'document_category'
             require_dependency 'issue_priority'

app/models/project.rb +68 -10

             # redMine - project management software
             # Copyright (C) 2006  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class Project < ActiveRecord::Base
               # Project statuses
               STATUS_ACTIVE     = 1
               STATUS_ARCHIVED   = 9
-              has_many :time_entry_activities, :conditions => {:active => true } # Specific overidden Activities
+              # Specific overidden Activities
+              has_many :time_entry_activities do
+                def active
+                  find(:all, :conditions => {:active => true})
+                end
+              end
               has_many :members, :include => :user, :conditions => "#{User.table_name}.type='User' AND #{User.table_name}.status=#{User::STATUS_ACTIVE}"
               has_many :member_principals, :class_name => 'Member',
                                            :include => :principal,
                                            :conditions => "#{Principal.table_name}.type='Group' OR (#{Principal.table_name}.type='User' AND #{Principal.table_name}.status=#{User::STATUS_ACTIVE})"
               has_many :users, :through => :members
               has_many :principals, :through => :member_principals, :source => :principal
               has_many :enabled_modules, :dependent => :delete_all
               has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
               has_many :issues, :dependent => :destroy, :order => "#{Issue.table_name}.created_on DESC", :include => [:status, :tracker]
               has_many :issue_changes, :through => :issues, :source => :journals
               has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
               has_many :time_entries, :dependent => :delete_all
               has_many :queries, :dependent => :delete_all
               has_many :documents, :dependent => :destroy
               has_many :news, :dependent => :delete_all, :include => :author
               has_many :issue_categories, :dependent => :delete_all, :order => "#{IssueCategory.table_name}.name"
               has_many :boards, :dependent => :destroy, :order => "position ASC"
               has_one :repository, :dependent => :destroy
               has_many :changesets, :through => :repository
               has_one :wiki, :dependent => :destroy
               # Custom field for the project issues
               has_and_belongs_to_many :issue_custom_fields,
                                       :class_name => 'IssueCustomField',
                                       :order => "#{CustomField.table_name}.position",
                                       :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}",
                                       :association_foreign_key => 'custom_field_id'
               acts_as_nested_set :order => 'name', :dependent => :destroy
               acts_as_attachable :view_permission => :view_files,
                                  :delete_permission => :manage_files
               acts_as_customizable
               acts_as_searchable :columns => ['name', 'description'], :project_key => 'id', :permission => nil
               acts_as_event :title => Proc.new {|o| "#{l(:label_project)}: #{o.name}"},
                             :url => Proc.new {|o| {:controller => 'projects', :action => 'show', :id => o.id}},
                             :author => nil
               attr_protected :status, :enabled_module_names
               validates_presence_of :name, :identifier
               validates_uniqueness_of :name, :identifier
               validates_associated :repository, :wiki
               validates_length_of :name, :maximum => 30
               validates_length_of :homepage, :maximum => 255
               validates_length_of :identifier, :in => 1..20
               # donwcase letters, digits, dashes but not digits only
               validates_format_of :identifier, :with => /^(?!\d+$)[a-z0-9\-]*$/, :if => Proc.new { |p| p.identifier_changed? }
               # reserved words
               validates_exclusion_of :identifier, :in => %w( new )
               before_destroy :delete_all_members
               named_scope :has_module, lambda { |mod| { :conditions => ["#{Project.table_name}.id IN (SELECT em.project_id FROM #{EnabledModule.table_name} em WHERE em.name=?)", mod.to_s] } }
               named_scope :active, { :conditions => "#{Project.table_name}.status = #{STATUS_ACTIVE}"}
               named_scope :all_public, { :conditions => { :is_public => true } }
               named_scope :visible, lambda { { :conditions => Project.visible_by(User.current) } }
               def identifier=(identifier)
                 super unless identifier_frozen?
               end
               def identifier_frozen?
                 errors[:identifier].nil? && !(new_record? || identifier.blank?)
               end
               def issues_with_subprojects(include_subprojects=false)
                 conditions = nil
                 if include_subprojects
                   ids = [id] + descendants.collect(&:id)
                   conditions = ["#{Project.table_name}.id IN (#{ids.join(',')}) AND #{Project.visible_by}"]
                 end
                 conditions ||= ["#{Project.table_name}.id = ?", id]
                 # Quick and dirty fix for Rails 2 compatibility
                 Issue.send(:with_scope, :find => { :conditions => conditions }) do
                   Version.send(:with_scope, :find => { :conditions => conditions }) do
                     yield
                   end
                 end
               end
               # returns latest created projects
               # non public projects will be returned only if user is a member of those
               def self.latest(user=nil, count=5)
                 find(:all, :limit => count, :conditions => visible_by(user), :order => "created_on DESC")
               end
               # Returns a SQL :conditions string used to find all active projects for the specified user.
               #
               # Examples:
               #     Projects.visible_by(admin)        => "projects.status = 1"
               #     Projects.visible_by(normal_user)  => "projects.status = 1 AND projects.is_public = 1"
               def self.visible_by(user=nil)
                 user ||= User.current
                 if user && user.admin?
                   return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
                 elsif user && user.memberships.any?
                   return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND (#{Project.table_name}.is_public = #{connection.quoted_true} or #{Project.table_name}.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')}))"
                 else
                   return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND #{Project.table_name}.is_public = #{connection.quoted_true}"
                 end
               end
               def self.allowed_to_condition(user, permission, options={})
                 statements = []
                 base_statement = "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
                 if perm = Redmine::AccessControl.permission(permission)
                   unless perm.project_module.nil?
                     # If the permission belongs to a project module, make sure the module is enabled
                     base_statement << " AND #{Project.table_name}.id IN (SELECT em.project_id FROM #{EnabledModule.table_name} em WHERE em.name='#{perm.project_module}')"
                   end
                 end
                 if options[:project]
                   project_statement = "#{Project.table_name}.id = #{options[:project].id}"
                   project_statement << " OR (#{Project.table_name}.lft > #{options[:project].lft} AND #{Project.table_name}.rgt < #{options[:project].rgt})" if options[:with_subprojects]
                   base_statement = "(#{project_statement}) AND (#{base_statement})"
                 end
                 if user.admin?
                   # no restriction
                 else
                   statements << "1=0"
                   if user.logged?
                     statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" if Role.non_member.allowed_to?(permission)
                     allowed_project_ids = user.memberships.select {|m| m.roles.detect {|role| role.allowed_to?(permission)}}.collect {|m| m.project_id}
                     statements << "#{Project.table_name}.id IN (#{allowed_project_ids.join(',')})" if allowed_project_ids.any?
                   elsif Role.anonymous.allowed_to?(permission)
                     # anonymous user allowed on public project
                     statements << "#{Project.table_name}.is_public = #{connection.quoted_true}"
                   else
                     # anonymous user is not authorized
                   end
                 end
                 statements.empty? ? base_statement : "((#{base_statement}) AND (#{statements.join(' OR ')}))"
               end
-              # Returns all the Systemwide and project specific activities
+              # Returns the Systemwide and project specific activities
-              def activities
+              def activities(include_inactive=false)
-                overridden_activity_ids = self.time_entry_activities.collect(&:parent_id)
+                if include_inactive
+                  return all_activities
+                else
+                  return active_activities
+                end
+              end
-                if overridden_activity_ids.empty?
+              # Will build a new Project specific Activity or update an existing one
-                  return TimeEntryActivity.active
+              def update_or_build_time_entry_activity(id, activity_hash)
+                if activity_hash.respond_to?(:has_key?) && activity_hash.has_key?('parent_id')
+                  self.build_time_entry_activity_if_needed(activity_hash)
                 else
-                  return system_activities_and_project_overrides
+                  activity = project.time_entry_activities.find_by_id(id.to_i)
+                  activity.update_attributes(activity_hash) if activity
+                end
+              end
+              # Builds new activity
+              def build_time_entry_activity_if_needed(activity)
+                # Only new override activities are built
+                if activity['parent_id']
+                  parent_activity = TimeEntryActivity.find(activity['parent_id'])
+                  activity['name'] = parent_activity.name
+                  activity['position'] = parent_activity.position
+                  if Enumeration.overridding_change?(activity, parent_activity)
+                    self.time_entry_activities.build(activity)
+                  end
                 end
               end
               # Returns a :conditions SQL string that can be used to find the issues associated with this project.
               #
               # Examples:
               #   project.project_condition(true)  => "(projects.id = 1 OR (projects.lft > 1 AND projects.rgt < 10))"
               #   project.project_condition(false) => "projects.id = 1"
               def project_condition(with_subprojects)
                 cond = "#{Project.table_name}.id = #{id}"
                 cond = "(#{cond} OR (#{Project.table_name}.lft > #{lft} AND #{Project.table_name}.rgt < #{rgt}))" if with_subprojects
                 cond
               end
               def self.find(*args)
                 if args.first && args.first.is_a?(String) && !args.first.match(/^\d*$/)
                   project = find_by_identifier(*args)
                   raise ActiveRecord::RecordNotFound, "Couldn't find Project with identifier=#{args.first}" if project.nil?
                   project
                 else
                   super
                 end
               end
               def to_param
                 # id is used for projects with a numeric identifier (compatibility)
                 @to_param ||= (identifier.to_s =~ %r{^\d*$} ? id : identifier)
               end
               def active?
                 self.status == STATUS_ACTIVE
               end
               # Archives the project and its descendants recursively
               def archive
                 # Archive subprojects if any
                 children.each do |subproject|
                   subproject.archive
                 end
                 update_attribute :status, STATUS_ARCHIVED
               end
               # Unarchives the project
               # All its ancestors must be active
               def unarchive
                 return false if ancestors.detect {|a| !a.active?}
                 update_attribute :status, STATUS_ACTIVE
               end
               # Returns an array of projects the project can be moved to
               def possible_parents
                 @possible_parents ||= (Project.active.find(:all) - self_and_descendants)
               end
               # Sets the parent of the project
               # Argument can be either a Project, a String, a Fixnum or nil
               def set_parent!(p)
                 unless p.nil? || p.is_a?(Project)
                   if p.to_s.blank?
                     p = nil
                   else
                     p = Project.find_by_id(p)
                     return false unless p
                   end
                 end
                 if p == parent && !p.nil?
                   # Nothing to do
                   true
                 elsif p.nil? || (p.active? && move_possible?(p))
                   # Insert the project so that target's children or root projects stay alphabetically sorted
                   sibs = (p.nil? ? self.class.roots : p.children)
                   to_be_inserted_before = sibs.detect {|c| c.name.to_s.downcase > name.to_s.downcase }
                   if to_be_inserted_before
                     move_to_left_of(to_be_inserted_before)
                   elsif p.nil?
                     if sibs.empty?
                       # move_to_root adds the project in first (ie. left) position
                       move_to_root
                     else
                       move_to_right_of(sibs.last) unless self == sibs.last
                     end
                   else
                     # move_to_child_of adds the project in last (ie.right) position
                     move_to_child_of(p)
                   end
                   true
                 else
                   # Can not move to the given target
                   false
                 end
               end
               # Returns an array of the trackers used by the project and its active sub projects
               def rolled_up_trackers
                 @rolled_up_trackers ||=
                   Tracker.find(:all, :include => :projects,
                                      :select => "DISTINCT #{Tracker.table_name}.*",
                                      :conditions => ["#{Project.table_name}.lft >= ? AND #{Project.table_name}.rgt <= ? AND #{Project.table_name}.status = #{STATUS_ACTIVE}", lft, rgt],
                                      :order => "#{Tracker.table_name}.position")
               end
               # Returns a hash of project users grouped by role
               def users_by_role
                 members.find(:all, :include => [:user, :roles]).inject({}) do |h, m|
                   m.roles.each do |r|
                     h[r] ||= []
                     h[r] << m.user
                   end
                   h
                 end
               end
               # Deletes all project's members
               def delete_all_members
                 me, mr = Member.table_name, MemberRole.table_name
                 connection.delete("DELETE FROM #{mr} WHERE #{mr}.member_id IN (SELECT #{me}.id FROM #{me} WHERE #{me}.project_id = #{id})")
                 Member.delete_all(['project_id = ?', id])
               end
               # Users issues can be assigned to
               def assignable_users
                 members.select {|m| m.roles.detect {|role| role.assignable?}}.collect {|m| m.user}.sort
               end
               # Returns the mail adresses of users that should be always notified on project events
               def recipients
                 members.select {|m| m.mail_notification? || m.user.mail_notification?}.collect {|m| m.user.mail}
               end
               # Returns an array of all custom fields enabled for project issues
               # (explictly associated custom fields and custom fields enabled for all projects)
               def all_issue_custom_fields
                 @all_issue_custom_fields ||= (IssueCustomField.for_all + issue_custom_fields).uniq.sort
               end
               def project
                 self
               end
               def <=>(project)
                 name.downcase <=> project.name.downcase
               end
               def to_s
                 name
               end
               # Returns a short description of the projects (first lines)
               def short_description(length = 255)
                 description.gsub(/^(.{#{length}}[^\n\r]*).*$/m, '\1...').strip if description
               end
               # Return true if this project is allowed to do the specified action.
               # action can be:
               # * a parameter-like Hash (eg. :controller => 'projects', :action => 'edit')
               # * a permission Symbol (eg. :edit_project)
               def allows_to?(action)
                 if action.is_a? Hash
                   allowed_actions.include? "#{action[:controller]}/#{action[:action]}"
                 else
                   allowed_permissions.include? action
                 end
               end
               def module_enabled?(module_name)
                 module_name = module_name.to_s
                 enabled_modules.detect {|m| m.name == module_name}
               end
               def enabled_module_names=(module_names)
                 if module_names && module_names.is_a?(Array)
                   module_names = module_names.collect(&:to_s)
                   # remove disabled modules
                   enabled_modules.each {|mod| mod.destroy unless module_names.include?(mod.name)}
                   # add new modules
                   module_names.each {|name| enabled_modules << EnabledModule.new(:name => name)}
                 else
                   enabled_modules.clear
                 end
               end
               # Returns an auto-generated project identifier based on the last identifier used
               def self.next_identifier
                 p = Project.find(:first, :order => 'created_on DESC')
                 p.nil? ? nil : p.identifier.to_s.succ
               end
               # Copies and saves the Project instance based on the +project+.
               # Will duplicate the source project's:
               # * Issues
               # * Members
               # * Queries
               def copy(project)
                 project = project.is_a?(Project) ? project : Project.find(project)
                 Project.transaction do
                   # Wikis
                   self.wiki = Wiki.new(project.wiki.attributes.dup.except("project_id"))
                   project.wiki.pages.each do |page|
                     new_wiki_content = WikiContent.new(page.content.attributes.dup.except("page_id"))
                     new_wiki_page = WikiPage.new(page.attributes.dup.except("wiki_id"))
                     new_wiki_page.content = new_wiki_content
                     self.wiki.pages << new_wiki_page
                   end
                   # Versions
                   project.versions.each do |version|
                     new_version = Version.new
                     new_version.attributes = version.attributes.dup.except("project_id")
                     self.versions << new_version
                   end
                   project.issue_categories.each do |issue_category|
                     new_issue_category = IssueCategory.new
                     new_issue_category.attributes = issue_category.attributes.dup.except("project_id")
                     self.issue_categories << new_issue_category
                   end
                   # Issues
                   project.issues.each do |issue|
                     new_issue = Issue.new
                     new_issue.copy_from(issue)
                     # Reassign fixed_versions by name, since names are unique per
                     # project and the versions for self are not yet saved
                     if issue.fixed_version
                       new_issue.fixed_version = self.versions.select {|v| v.name == issue.fixed_version.name}.first
                     end
                     # Reassign the category by name, since names are unique per
                     # project and the categories for self are not yet saved
                     if issue.category
                       new_issue.category = self.issue_categories.select {|c| c.name == issue.category.name}.first
                     end
                     self.issues << new_issue
                   end
                   # Members
                   project.members.each do |member|
                     new_member = Member.new
                     new_member.attributes = member.attributes.dup.except("project_id")
                     new_member.role_ids = member.role_ids.dup
                     new_member.project = self
                     self.members << new_member
                   end
                   # Queries
                   project.queries.each do |query|
                     new_query = Query.new
                     new_query.attributes = query.attributes.dup.except("project_id", "sort_criteria")
                     new_query.sort_criteria = query.sort_criteria if query.sort_criteria
                     new_query.project = self
                     self.queries << new_query
                   end
                   Redmine::Hook.call_hook(:model_project_copy_before_save, :source_project => project, :destination_project => self)
                   self.save
                 end
               end
               # Copies +project+ and returns the new instance.  This will not save
               # the copy
               def self.copy_from(project)
                 begin
                   project = project.is_a?(Project) ? project : Project.find(project)
                   if project
                     # clear unique attributes
                     attributes = project.attributes.dup.except('name', 'identifier', 'id', 'status')
                     copy = Project.new(attributes)
                     copy.enabled_modules = project.enabled_modules
                     copy.trackers = project.trackers
                     copy.custom_values = project.custom_values.collect {|v| v.clone}
                     copy.issue_custom_fields = project.issue_custom_fields
                     return copy
                   else
                     return nil
                   end
                 rescue ActiveRecord::RecordNotFound
                   return nil
                 end
               end
             private
               def allowed_permissions
                 @allowed_permissions ||= begin
                   module_names = enabled_modules.collect {|m| m.name}
                   Redmine::AccessControl.modules_permissions(module_names).collect {|p| p.name}
                 end
               end
               def allowed_actions
                 @actions_allowed ||= allowed_permissions.inject([]) { |actions, permission| actions += Redmine::AccessControl.allowed_actions(permission) }.flatten
               end
-              # Returns the systemwide activities merged with the project specific overrides
+              # Returns all the active Systemwide and project specific activities
-              def system_activities_and_project_overrides
+              def active_activities
-                return TimeEntryActivity.active.
+                overridden_activity_ids = self.time_entry_activities.active.collect(&:parent_id)
+                if overridden_activity_ids.empty?
+                  return TimeEntryActivity.active
+                else
+                  return system_activities_and_project_overrides
+                end
+              end
+              # Returns all the Systemwide and project specific activities
+              # (inactive and active)
+              def all_activities
+                overridden_activity_ids = self.time_entry_activities.collect(&:parent_id)
+                if overridden_activity_ids.empty?
+                  return TimeEntryActivity.all
+                else
+                  return system_activities_and_project_overrides(true)
+                end
+              end
+              # Returns the systemwide active activities merged with the project specific overrides
+              def system_activities_and_project_overrides(include_inactive=false)
+                if include_inactive
+                  return TimeEntryActivity.all.
                     find(:all,
                          :conditions => ["id NOT IN (?)", self.time_entry_activities.collect(&:parent_id)]) +
                     self.time_entry_activities
+                else
+                  return TimeEntryActivity.active.
+                    find(:all,
+                         :conditions => ["id NOT IN (?)", self.time_entry_activities.active.collect(&:parent_id)]) +
+                    self.time_entry_activities.active
+                end
               end
             end

config/locales/en.yml +1 0

             en:
               date:
                 formats:
                   # Use the strftime parameters for formats.
                   # When no format has been given, it uses default.
                   # You can provide other formats here if you like!
                   default: "%m/%d/%Y"
                   short: "%b %d"
                   long: "%B %d, %Y"
                 day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
                 abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
                 # Don't forget the nil at the beginning; there's no such thing as a 0th month
                 month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
                 abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
                 # Used in date_select and datime_select.
                 order: [ :year, :month, :day ]
               time:
                 formats:
                   default: "%m/%d/%Y %I:%M %p"
                   time: "%I:%M %p"
                   short: "%d %b %H:%M"
                   long: "%B %d, %Y %H:%M"
                 am: "am"
                 pm: "pm"
               datetime:
                 distance_in_words:
                   half_a_minute: "half a minute"
                   less_than_x_seconds:
                     one:   "less than 1 second"
                     other: "less than {{count}} seconds"
                   x_seconds:
                     one:   "1 second"
                     other: "{{count}} seconds"
                   less_than_x_minutes:
                     one:   "less than a minute"
                     other: "less than {{count}} minutes"
                   x_minutes:
                     one:   "1 minute"
                     other: "{{count}} minutes"
                   about_x_hours:
                     one:   "about 1 hour"
                     other: "about {{count}} hours"
                   x_days:
                     one:   "1 day"
                     other: "{{count}} days"
                   about_x_months:
                     one:   "about 1 month"
                     other: "about {{count}} months"
                   x_months:
                     one:   "1 month"
                     other: "{{count}} months"
                   about_x_years:
                     one:   "about 1 year"
                     other: "about {{count}} years"
                   over_x_years:
                     one:   "over 1 year"
                     other: "over {{count}} years"
               number:
                 human:
                   format:
                     delimiter: ""
                     precision: 1
                   storage_units:
                     format: "%n %u"
                     units:
                       byte:
                         one: "Byte"
                         other: "Bytes"
                       kb: "KB"
                       mb: "MB"
                       gb: "GB"
                       tb: "TB"
             # Used in array.to_sentence.
               support:
                 array:
                   sentence_connector: "and"
                   skip_last_comma: false
               activerecord:
                 errors:
                   messages:
                     inclusion: "is not included in the list"
                     exclusion: "is reserved"
                     invalid: "is invalid"
                     confirmation: "doesn't match confirmation"
                     accepted: "must be accepted"
                     empty: "can't be empty"
                     blank: "can't be blank"
                     too_long: "is too long (maximum is {{count}} characters)"
                     too_short: "is too short (minimum is {{count}} characters)"
                     wrong_length: "is the wrong length (should be {{count}} characters)"
                     taken: "has already been taken"
                     not_a_number: "is not a number"
                     not_a_date: "is not a valid date"
                     greater_than: "must be greater than {{count}}"
                     greater_than_or_equal_to: "must be greater than or equal to {{count}}"
                     equal_to: "must be equal to {{count}}"
                     less_than: "must be less than {{count}}"
                     less_than_or_equal_to: "must be less than or equal to {{count}}"
                     odd: "must be odd"
                     even: "must be even"
                     greater_than_start_date: "must be greater than start date"
                     not_same_project: "doesn't belong to the same project"
                     circular_dependency: "This relation would create a circular dependency"
               actionview_instancetag_blank_option: Please select
               general_text_No: 'No'
               general_text_Yes: 'Yes'
               general_text_no: 'no'
               general_text_yes: 'yes'
               general_lang_name: 'English'
               general_csv_separator: ','
               general_csv_decimal_separator: '.'
               general_csv_encoding: ISO-8859-1
               general_pdf_encoding: ISO-8859-1
               general_first_day_of_week: '7'
               notice_account_updated: Account was successfully updated.
               notice_account_invalid_creditentials: Invalid user or password
               notice_account_password_updated: Password was successfully updated.
               notice_account_wrong_password: Wrong password
               notice_account_register_done: Account was successfully created. To activate your account, click on the link that was emailed to you.
               notice_account_unknown_email: Unknown user.
               notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
               notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
               notice_account_activated: Your account has been activated. You can now log in.
               notice_successful_create: Successful creation.
               notice_successful_update: Successful update.
               notice_successful_delete: Successful deletion.
               notice_successful_connection: Successful connection.
               notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
               notice_locking_conflict: Data has been updated by another user.
               notice_not_authorized: You are not authorized to access this page.
               notice_email_sent: "An email was sent to {{value}}"
               notice_email_error: "An error occurred while sending mail ({{value}})"
               notice_feeds_access_key_reseted: Your RSS access key was reset.
               notice_failed_to_save_issues: "Failed to save {{count}} issue(s) on {{total}} selected: {{ids}}."
               notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
               notice_account_pending: "Your account was created and is now pending administrator approval."
               notice_default_data_loaded: Default configuration successfully loaded.
               notice_unable_delete_version: Unable to delete version.
               error_can_t_load_default_data: "Default configuration could not be loaded: {{value}}"
               error_scm_not_found: "The entry or revision was not found in the repository."
               error_scm_command_failed: "An error occurred when trying to access the repository: {{value}}"
               error_scm_annotate: "The entry does not exist or can not be annotated."
               error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
               error_no_tracker_in_project: 'No tracker is associated to this project. Please check the Project settings.'
               error_no_default_issue_status: 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
               warning_attachments_not_saved: "{{count}} file(s) could not be saved."
               mail_subject_lost_password: "Your {{value}} password"
               mail_body_lost_password: 'To change your password, click on the following link:'
               mail_subject_register: "Your {{value}} account activation"
               mail_body_register: 'To activate your account, click on the following link:'
               mail_body_account_information_external: "You can use your {{value}} account to log in."
               mail_body_account_information: Your account information
               mail_subject_account_activation_request: "{{value}} account activation request"
               mail_body_account_activation_request: "A new user ({{value}}) has registered. The account is pending your approval:"
               mail_subject_reminder: "{{count}} issue(s) due in the next days"
               mail_body_reminder: "{{count}} issue(s) that are assigned to you are due in the next {{days}} days:"
               mail_subject_wiki_content_added: "'{{page}}' wiki page has been added"
               mail_body_wiki_content_added: "The '{{page}}' wiki page has been added by {{author}}."
               mail_subject_wiki_content_updated: "'{{page}}' wiki page has been updated"
               mail_body_wiki_content_updated: "The '{{page}}' wiki page has been updated by {{author}}."
               gui_validation_error: 1 error
               gui_validation_error_plural: "{{count}} errors"
               field_name: Name
               field_description: Description
               field_summary: Summary
               field_is_required: Required
               field_firstname: Firstname
               field_lastname: Lastname
               field_mail: Email
               field_filename: File
               field_filesize: Size
               field_downloads: Downloads
               field_author: Author
               field_created_on: Created
               field_updated_on: Updated
               field_field_format: Format
               field_is_for_all: For all projects
               field_possible_values: Possible values
               field_regexp: Regular expression
               field_min_length: Minimum length
               field_max_length: Maximum length
               field_value: Value
               field_category: Category
               field_title: Title
               field_project: Project
               field_issue: Issue
               field_status: Status
               field_notes: Notes
               field_is_closed: Issue closed
               field_is_default: Default value
               field_tracker: Tracker
               field_subject: Subject
               field_due_date: Due date
               field_assigned_to: Assigned to
               field_priority: Priority
               field_fixed_version: Target version
               field_user: User
               field_role: Role
               field_homepage: Homepage
               field_is_public: Public
               field_parent: Subproject of
               field_is_in_chlog: Issues displayed in changelog
               field_is_in_roadmap: Issues displayed in roadmap
               field_login: Login
               field_mail_notification: Email notifications
               field_admin: Administrator
               field_last_login_on: Last connection
               field_language: Language
               field_effective_date: Date
               field_password: Password
               field_new_password: New password
               field_password_confirmation: Confirmation
               field_version: Version
               field_type: Type
               field_host: Host
               field_port: Port
               field_account: Account
               field_base_dn: Base DN
               field_attr_login: Login attribute
               field_attr_firstname: Firstname attribute
               field_attr_lastname: Lastname attribute
               field_attr_mail: Email attribute
               field_onthefly: On-the-fly user creation
               field_start_date: Start
               field_done_ratio: % Done
               field_auth_source: Authentication mode
               field_hide_mail: Hide my email address
               field_comments: Comment
               field_url: URL
               field_start_page: Start page
               field_subproject: Subproject
               field_hours: Hours
               field_activity: Activity
               field_spent_on: Date
               field_identifier: Identifier
               field_is_filter: Used as a filter
               field_issue_to: Related issue
               field_delay: Delay
               field_assignable: Issues can be assigned to this role
               field_redirect_existing_links: Redirect existing links
               field_estimated_hours: Estimated time
               field_column_names: Columns
               field_time_zone: Time zone
               field_searchable: Searchable
               field_default_value: Default value
               field_comments_sorting: Display comments
               field_parent_title: Parent page
               field_editable: Editable
               field_watcher: Watcher
               field_identity_url: OpenID URL
               field_content: Content
               field_group_by: Group results by
               setting_app_title: Application title
               setting_app_subtitle: Application subtitle
               setting_welcome_text: Welcome text
               setting_default_language: Default language
               setting_login_required: Authentication required
               setting_self_registration: Self-registration
               setting_attachment_max_size: Attachment max. size
               setting_issues_export_limit: Issues export limit
               setting_mail_from: Emission email address
               setting_bcc_recipients: Blind carbon copy recipients (bcc)
               setting_plain_text_mail: Plain text mail (no HTML)
               setting_host_name: Host name and path
               setting_text_formatting: Text formatting
               setting_wiki_compression: Wiki history compression
               setting_feeds_limit: Feed content limit
               setting_default_projects_public: New projects are public by default
               setting_autofetch_changesets: Autofetch commits
               setting_sys_api_enabled: Enable WS for repository management
               setting_commit_ref_keywords: Referencing keywords
               setting_commit_fix_keywords: Fixing keywords
               setting_autologin: Autologin
               setting_date_format: Date format
               setting_time_format: Time format
               setting_cross_project_issue_relations: Allow cross-project issue relations
               setting_issue_list_default_columns: Default columns displayed on the issue list
               setting_repositories_encodings: Repositories encodings
               setting_commit_logs_encoding: Commit messages encoding
               setting_emails_footer: Emails footer
               setting_protocol: Protocol
               setting_per_page_options: Objects per page options
               setting_user_format: Users display format
               setting_activity_days_default: Days displayed on project activity
               setting_display_subprojects_issues: Display subprojects issues on main projects by default
               setting_enabled_scm: Enabled SCM
               setting_mail_handler_api_enabled: Enable WS for incoming emails
               setting_mail_handler_api_key: API key
               setting_sequential_project_identifiers: Generate sequential project identifiers
               setting_gravatar_enabled: Use Gravatar user icons
               setting_diff_max_lines_displayed: Max number of diff lines displayed
               setting_file_max_size_displayed: Max size of text files displayed inline
               setting_repository_log_display_limit: Maximum number of revisions displayed on file log
               setting_openid: Allow OpenID login and registration
               setting_password_min_length: Minimum password length
               setting_new_project_user_role_id: Role given to a non-admin user who creates a project
               permission_add_project: Create project
               permission_edit_project: Edit project
               permission_select_project_modules: Select project modules
               permission_manage_members: Manage members
               permission_manage_versions: Manage versions
               permission_manage_categories: Manage issue categories
               permission_add_issues: Add issues
               permission_edit_issues: Edit issues
               permission_manage_issue_relations: Manage issue relations
               permission_add_issue_notes: Add notes
               permission_edit_issue_notes: Edit notes
               permission_edit_own_issue_notes: Edit own notes
               permission_move_issues: Move issues
               permission_delete_issues: Delete issues
               permission_manage_public_queries: Manage public queries
               permission_save_queries: Save queries
               permission_view_gantt: View gantt chart
               permission_view_calendar: View calender
               permission_view_issue_watchers: View watchers list
               permission_add_issue_watchers: Add watchers
               permission_log_time: Log spent time
               permission_view_time_entries: View spent time
               permission_edit_time_entries: Edit time logs
               permission_edit_own_time_entries: Edit own time logs
               permission_manage_news: Manage news
               permission_comment_news: Comment news
               permission_manage_documents: Manage documents
               permission_view_documents: View documents
               permission_manage_files: Manage files
               permission_view_files: View files
               permission_manage_wiki: Manage wiki
               permission_rename_wiki_pages: Rename wiki pages
               permission_delete_wiki_pages: Delete wiki pages
               permission_view_wiki_pages: View wiki
               permission_view_wiki_edits: View wiki history
               permission_edit_wiki_pages: Edit wiki pages
               permission_delete_wiki_pages_attachments: Delete attachments
               permission_protect_wiki_pages: Protect wiki pages
               permission_manage_repository: Manage repository
               permission_browse_repository: Browse repository
               permission_view_changesets: View changesets
               permission_commit_access: Commit access
               permission_manage_boards: Manage boards
               permission_view_messages: View messages
               permission_add_messages: Post messages
               permission_edit_messages: Edit messages
               permission_edit_own_messages: Edit own messages
               permission_delete_messages: Delete messages
               permission_delete_own_messages: Delete own messages
               project_module_issue_tracking: Issue tracking
               project_module_time_tracking: Time tracking
               project_module_news: News
               project_module_documents: Documents
               project_module_files: Files
               project_module_wiki: Wiki
               project_module_repository: Repository
               project_module_boards: Boards
               label_user: User
               label_user_plural: Users
               label_user_new: New user
               label_project: Project
               label_project_new: New project
               label_project_plural: Projects
               label_x_projects:
                 zero:  no projects
                 one:   1 project
                 other: "{{count}} projects"
               label_project_all: All Projects
               label_project_latest: Latest projects
               label_issue: Issue
               label_issue_new: New issue
               label_issue_plural: Issues
               label_issue_view_all: View all issues
               label_issues_by: "Issues by {{value}}"
               label_issue_added: Issue added
               label_issue_updated: Issue updated
               label_document: Document
               label_document_new: New document
               label_document_plural: Documents
               label_document_added: Document added
               label_role: Role
               label_role_plural: Roles
               label_role_new: New role
               label_role_and_permissions: Roles and permissions
               label_member: Member
               label_member_new: New member
               label_member_plural: Members
               label_tracker: Tracker
               label_tracker_plural: Trackers
               label_tracker_new: New tracker
               label_workflow: Workflow
               label_issue_status: Issue status
               label_issue_status_plural: Issue statuses
               label_issue_status_new: New status
               label_issue_category: Issue category
               label_issue_category_plural: Issue categories
               label_issue_category_new: New category
               label_custom_field: Custom field
               label_custom_field_plural: Custom fields
               label_custom_field_new: New custom field
               label_enumerations: Enumerations
               label_enumeration_new: New value
               label_information: Information
               label_information_plural: Information
               label_please_login: Please log in
               label_register: Register
               label_login_with_open_id_option: or login with OpenID
               label_password_lost: Lost password
               label_home: Home
               label_my_page: My page
               label_my_account: My account
               label_my_projects: My projects
               label_administration: Administration
               label_login: Sign in
               label_logout: Sign out
               label_help: Help
               label_reported_issues: Reported issues
               label_assigned_to_me_issues: Issues assigned to me
               label_last_login: Last connection
               label_registered_on: Registered on
               label_activity: Activity
               label_overall_activity: Overall activity
               label_user_activity: "{{value}}'s activity"
               label_new: New
               label_logged_as: Logged in as
               label_environment: Environment
               label_authentication: Authentication
               label_auth_source: Authentication mode
               label_auth_source_new: New authentication mode
               label_auth_source_plural: Authentication modes
               label_subproject_plural: Subprojects
               label_and_its_subprojects: "{{value}} and its subprojects"
               label_min_max_length: Min - Max length
               label_list: List
               label_date: Date
               label_integer: Integer
               label_float: Float
               label_boolean: Boolean
               label_string: Text
               label_text: Long text
               label_attribute: Attribute
               label_attribute_plural: Attributes
               label_download: "{{count}} Download"
               label_download_plural: "{{count}} Downloads"
               label_no_data: No data to display
               label_change_status: Change status
               label_history: History
               label_attachment: File
               label_attachment_new: New file
               label_attachment_delete: Delete file
               label_attachment_plural: Files
               label_file_added: File added
               label_report: Report
               label_report_plural: Reports
               label_news: News
               label_news_new: Add news
               label_news_plural: News
               label_news_latest: Latest news
               label_news_view_all: View all news
               label_news_added: News added
               label_change_log: Change log
               label_settings: Settings
               label_overview: Overview
               label_version: Version
               label_version_new: New version
               label_version_plural: Versions
               label_confirmation: Confirmation
               label_export_to: 'Also available in:'
               label_read: Read...
               label_public_projects: Public projects
               label_open_issues: open
               label_open_issues_plural: open
               label_closed_issues: closed
               label_closed_issues_plural: closed
               label_x_open_issues_abbr_on_total:
                 zero:  0 open / {{total}}
                 one:   1 open / {{total}}
                 other: "{{count}} open / {{total}}"
               label_x_open_issues_abbr:
                 zero:  0 open
                 one:   1 open
                 other: "{{count}} open"
               label_x_closed_issues_abbr:
                 zero:  0 closed
                 one:   1 closed
                 other: "{{count}} closed"
               label_total: Total
               label_permissions: Permissions
               label_current_status: Current status
               label_new_statuses_allowed: New statuses allowed
               label_all: all
               label_none: none
               label_nobody: nobody
               label_next: Next
               label_previous: Previous
               label_used_by: Used by
               label_details: Details
               label_add_note: Add a note
               label_per_page: Per page
               label_calendar: Calendar
               label_months_from: months from
               label_gantt: Gantt
               label_internal: Internal
               label_last_changes: "last {{count}} changes"
               label_change_view_all: View all changes
               label_personalize_page: Personalize this page
               label_comment: Comment
               label_comment_plural: Comments
               label_x_comments:
                 zero: no comments
                 one: 1 comment
                 other: "{{count}} comments"
               label_comment_add: Add a comment
               label_comment_added: Comment added
               label_comment_delete: Delete comments
               label_query: Custom query
               label_query_plural: Custom queries
               label_query_new: New query
               label_filter_add: Add filter
               label_filter_plural: Filters
               label_equals: is
               label_not_equals: is not
               label_in_less_than: in less than
               label_in_more_than: in more than
               label_greater_or_equal: '>='
               label_less_or_equal: '<='
               label_in: in
               label_today: today
               label_all_time: all time
               label_yesterday: yesterday
               label_this_week: this week
               label_last_week: last week
               label_last_n_days: "last {{count}} days"
               label_this_month: this month
               label_last_month: last month
               label_this_year: this year
               label_date_range: Date range
               label_less_than_ago: less than days ago
               label_more_than_ago: more than days ago
               label_ago: days ago
               label_contains: contains
               label_not_contains: doesn't contain
               label_day_plural: days
               label_repository: Repository
               label_repository_plural: Repositories
               label_browse: Browse
               label_modification: "{{count}} change"
               label_modification_plural: "{{count}} changes"
               label_branch: Branch
               label_tag: Tag
               label_revision: Revision
               label_revision_plural: Revisions
               label_associated_revisions: Associated revisions
               label_added: added
               label_modified: modified
               label_copied: copied
               label_renamed: renamed
               label_deleted: deleted
               label_latest_revision: Latest revision
               label_latest_revision_plural: Latest revisions
               label_view_revisions: View revisions
               label_view_all_revisions: View all revisions
               label_max_size: Maximum size
               label_sort_highest: Move to top
               label_sort_higher: Move up
               label_sort_lower: Move down
               label_sort_lowest: Move to bottom
               label_roadmap: Roadmap
               label_roadmap_due_in: "Due in {{value}}"
               label_roadmap_overdue: "{{value}} late"
               label_roadmap_no_issues: No issues for this version
               label_search: Search
               label_result_plural: Results
               label_all_words: All words
               label_wiki: Wiki
               label_wiki_edit: Wiki edit
               label_wiki_edit_plural: Wiki edits
               label_wiki_page: Wiki page
               label_wiki_page_plural: Wiki pages
               label_index_by_title: Index by title
               label_index_by_date: Index by date
               label_current_version: Current version
               label_preview: Preview
               label_feed_plural: Feeds
               label_changes_details: Details of all changes
               label_issue_tracking: Issue tracking
               label_spent_time: Spent time
               label_f_hour: "{{value}} hour"
               label_f_hour_plural: "{{value}} hours"
               label_time_tracking: Time tracking
               label_change_plural: Changes
               label_statistics: Statistics
               label_commits_per_month: Commits per month
               label_commits_per_author: Commits per author
               label_view_diff: View differences
               label_diff_inline: inline
               label_diff_side_by_side: side by side
               label_options: Options
               label_copy_workflow_from: Copy workflow from
               label_permissions_report: Permissions report
               label_watched_issues: Watched issues
               label_related_issues: Related issues
               label_applied_status: Applied status
               label_loading: Loading...
               label_relation_new: New relation
               label_relation_delete: Delete relation
               label_relates_to: related to
               label_duplicates: duplicates
               label_duplicated_by: duplicated by
               label_blocks: blocks
               label_blocked_by: blocked by
               label_precedes: precedes
               label_follows: follows
               label_end_to_start: end to start
               label_end_to_end: end to end
               label_start_to_start: start to start
               label_start_to_end: start to end
               label_stay_logged_in: Stay logged in
               label_disabled: disabled
               label_show_completed_versions: Show completed versions
               label_me: me
               label_board: Forum
               label_board_new: New forum
               label_board_plural: Forums
               label_topic_plural: Topics
               label_message_plural: Messages
               label_message_last: Last message
               label_message_new: New message
               label_message_posted: Message added
               label_reply_plural: Replies
               label_send_information: Send account information to the user
               label_year: Year
               label_month: Month
               label_week: Week
               label_date_from: From
               label_date_to: To
               label_language_based: Based on user's language
               label_sort_by: "Sort by {{value}}"
               label_send_test_email: Send a test email
               label_feeds_access_key_created_on: "RSS access key created {{value}} ago"
               label_module_plural: Modules
               label_added_time_by: "Added by {{author}} {{age}} ago"
               label_updated_time_by: "Updated by {{author}} {{age}} ago"
               label_updated_time: "Updated {{value}} ago"
               label_jump_to_a_project: Jump to a project...
               label_file_plural: Files
               label_changeset_plural: Changesets
               label_default_columns: Default columns
               label_no_change_option: (No change)
               label_bulk_edit_selected_issues: Bulk edit selected issues
               label_theme: Theme
               label_default: Default
               label_search_titles_only: Search titles only
               label_user_mail_option_all: "For any event on all my projects"
               label_user_mail_option_selected: "For any event on the selected projects only..."
               label_user_mail_option_none: "Only for things I watch or I'm involved in"
               label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
               label_registration_activation_by_email: account activation by email
               label_registration_manual_activation: manual account activation
               label_registration_automatic_activation: automatic account activation
               label_display_per_page: "Per page: {{value}}"
               label_age: Age
               label_change_properties: Change properties
               label_general: General
               label_more: More
               label_scm: SCM
               label_plugins: Plugins
               label_ldap_authentication: LDAP authentication
               label_downloads_abbr: D/L
               label_optional_description: Optional description
               label_add_another_file: Add another file
               label_preferences: Preferences
               label_chronological_order: In chronological order
               label_reverse_chronological_order: In reverse chronological order
               label_planning: Planning
               label_incoming_emails: Incoming emails
               label_generate_key: Generate a key
               label_issue_watchers: Watchers
               label_example: Example
               label_display: Display
               label_sort: Sort
               label_ascending: Ascending
               label_descending: Descending
               label_date_from_to: From {{start}} to {{end}}
               label_wiki_content_added: Wiki page added
               label_wiki_content_updated: Wiki page updated
               label_group: Group
               label_group_plural: Groups
               label_group_new: New group
               label_time_entry_plural: Spent time
               button_login: Login
               button_submit: Submit
               button_save: Save
               button_check_all: Check all
               button_uncheck_all: Uncheck all
               button_delete: Delete
               button_create: Create
               button_create_and_continue: Create and continue
               button_test: Test
               button_edit: Edit
               button_add: Add
               button_change: Change
               button_apply: Apply
               button_clear: Clear
               button_lock: Lock
               button_unlock: Unlock
               button_download: Download
               button_list: List
               button_view: View
               button_move: Move
               button_back: Back
               button_cancel: Cancel
               button_activate: Activate
               button_sort: Sort
               button_log_time: Log time
               button_rollback: Rollback to this version
               button_watch: Watch
               button_unwatch: Unwatch
               button_reply: Reply
               button_archive: Archive
               button_unarchive: Unarchive
               button_reset: Reset
               button_rename: Rename
               button_change_password: Change password
               button_copy: Copy
               button_annotate: Annotate
               button_update: Update
               button_configure: Configure
               button_quote: Quote
               status_active: active
               status_registered: registered
               status_locked: locked
               field_active: Active
               text_select_mail_notifications: Select actions for which email notifications should be sent.
               text_regexp_info: eg. ^[A-Z0-9]+$
               text_min_max_length_info: 0 means no restriction
               text_project_destroy_confirmation: Are you sure you want to delete this project and related data ?
               text_subprojects_destroy_warning: "Its subproject(s): {{value}} will be also deleted."
               text_workflow_edit: Select a role and a tracker to edit the workflow
               text_are_you_sure: Are you sure ?
               text_journal_changed: "{{label}} changed from {{old}} to {{new}}"
               text_journal_set_to: "{{label}} set to {{value}}"
               text_journal_deleted: "{{label}} deleted ({{old}})"
               text_journal_added: "{{label}} {{value}} added"
               text_tip_task_begin_day: task beginning this day
               text_tip_task_end_day: task ending this day
               text_tip_task_begin_end_day: task beginning and ending this day
               text_project_identifier_info: 'Only lower case letters (a-z), numbers and dashes are allowed.<br />Once saved, the identifier can not be changed.'
               text_caracters_maximum: "{{count}} characters maximum."
               text_caracters_minimum: "Must be at least {{count}} characters long."
               text_length_between: "Length between {{min}} and {{max}} characters."
               text_tracker_no_workflow: No workflow defined for this tracker
               text_unallowed_characters: Unallowed characters
               text_comma_separated: Multiple values allowed (comma separated).
               text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
               text_issue_added: "Issue {{id}} has been reported by {{author}}."
               text_issue_updated: "Issue {{id}} has been updated by {{author}}."
               text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
               text_issue_category_destroy_question: "Some issues ({{count}}) are assigned to this category. What do you want to do ?"
               text_issue_category_destroy_assignments: Remove category assignments
               text_issue_category_reassign_to: Reassign issues to this category
               text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
               text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
               text_load_default_configuration: Load the default configuration
               text_status_changed_by_changeset: "Applied in changeset {{value}}."
               text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
               text_select_project_modules: 'Select modules to enable for this project:'
               text_default_administrator_account_changed: Default administrator account changed
               text_file_repository_writable: Attachments directory writable
               text_plugin_assets_writable: Plugin assets directory writable
               text_rmagick_available: RMagick available (optional)
               text_destroy_time_entries_question: "{{hours}} hours were reported on the issues you are about to delete. What do you want to do ?"
               text_destroy_time_entries: Delete reported hours
               text_assign_time_entries_to_project: Assign reported hours to the project
               text_reassign_time_entries: 'Reassign reported hours to this issue:'
               text_user_wrote: "{{value}} wrote:"
               text_enumeration_destroy_question: "{{count}} objects are assigned to this value."
               text_enumeration_category_reassign_to: 'Reassign them to this value:'
               text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
               text_repository_usernames_mapping: "Select or update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
               text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
               text_custom_field_possible_values_info: 'One line for each value'
               text_wiki_page_destroy_question: "This page has {{descendants}} child page(s) and descendant(s). What do you want to do?"
               text_wiki_page_nullify_children: "Keep child pages as root pages"
               text_wiki_page_destroy_children: "Delete child pages and all their descendants"
               text_wiki_page_reassign_children: "Reassign child pages to this parent page"
               default_role_manager: Manager
               default_role_developper: Developer
               default_role_reporter: Reporter
               default_tracker_bug: Bug
               default_tracker_feature: Feature
               default_tracker_support: Support
               default_issue_status_new: New
               default_issue_status_in_progress: In Progress
               default_issue_status_resolved: Resolved
               default_issue_status_feedback: Feedback
               default_issue_status_closed: Closed
               default_issue_status_rejected: Rejected
               default_doc_category_user: User documentation
               default_doc_category_tech: Technical documentation
               default_priority_low: Low
               default_priority_normal: Normal
               default_priority_high: High
               default_priority_urgent: Urgent
               default_priority_immediate: Immediate
               default_activity_design: Design
               default_activity_development: Development
               enumeration_issue_priorities: Issue priorities
               enumeration_doc_categories: Document categories
               enumeration_activities: Activities (time tracking)
+              enumeration_system_activity: System Activity

config/routes.rb +5 0

             ActionController::Routing::Routes.draw do |map|
               # Add your own custom routes here.
               # The priority is based upon order of creation: first created -> highest priority.
               # Here's a sample route:
               # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
               # Keep in mind you can assign values other than :controller and :action
               map.home '', :controller => 'welcome'
               map.signin 'login', :controller => 'account', :action => 'login'
               map.signout 'logout', :controller => 'account', :action => 'logout'
               map.connect 'roles/workflow/:id/:role_id/:tracker_id', :controller => 'roles', :action => 'workflow'
               map.connect 'help/:ctrl/:page', :controller => 'help'
               map.connect 'time_entries/:id/edit', :action => 'edit', :controller => 'timelog'
               map.connect 'projects/:project_id/time_entries/new', :action => 'edit', :controller => 'timelog'
               map.connect 'projects/:project_id/issues/:issue_id/time_entries/new', :action => 'edit', :controller => 'timelog'
               map.with_options :controller => 'timelog' do |timelog|
                 timelog.connect 'projects/:project_id/time_entries', :action => 'details'
                 timelog.with_options :action => 'details', :conditions => {:method => :get}  do |time_details|
                   time_details.connect 'time_entries'
                   time_details.connect 'time_entries.:format'
                   time_details.connect 'issues/:issue_id/time_entries'
                   time_details.connect 'issues/:issue_id/time_entries.:format'
                   time_details.connect 'projects/:project_id/time_entries.:format'
                   time_details.connect 'projects/:project_id/issues/:issue_id/time_entries'
                   time_details.connect 'projects/:project_id/issues/:issue_id/time_entries.:format'
                 end
                 timelog.connect 'projects/:project_id/time_entries/report', :action => 'report'
                 timelog.with_options :action => 'report',:conditions => {:method => :get} do |time_report|
                   time_report.connect 'time_entries/report'
                   time_report.connect 'time_entries/report.:format'
                   time_report.connect 'projects/:project_id/time_entries/report.:format'
                 end
                 timelog.with_options :action => 'edit', :conditions => {:method => :get} do |time_edit|
                   time_edit.connect 'issues/:issue_id/time_entries/new'
                 end
                 timelog.connect 'time_entries/:id/destroy', :action => 'destroy', :conditions => {:method => :post}
               end
               map.connect 'projects/:id/wiki', :controller => 'wikis', :action => 'edit', :conditions => {:method => :post}
               map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :get}
               map.connect 'projects/:id/wiki/destroy', :controller => 'wikis', :action => 'destroy', :conditions => {:method => :post}
               map.with_options :controller => 'wiki' do |wiki_routes|
                 wiki_routes.with_options :conditions => {:method => :get} do |wiki_views|
                   wiki_views.connect 'projects/:id/wiki/:page', :action => 'special', :page => /page_index|date_index|export/i
                   wiki_views.connect 'projects/:id/wiki/:page', :action => 'index', :page => nil
                   wiki_views.connect 'projects/:id/wiki/:page/edit', :action => 'edit'
                   wiki_views.connect 'projects/:id/wiki/:page/rename', :action => 'rename'
                   wiki_views.connect 'projects/:id/wiki/:page/history', :action => 'history'
                   wiki_views.connect 'projects/:id/wiki/:page/diff/:version/vs/:version_from', :action => 'diff'
                   wiki_views.connect 'projects/:id/wiki/:page/annotate/:version', :action => 'annotate'
                 end
                 wiki_routes.connect 'projects/:id/wiki/:page/:action',
                   :action => /edit|rename|destroy|preview|protect/,
                   :conditions => {:method => :post}
               end
               map.with_options :controller => 'messages' do |messages_routes|
                 messages_routes.with_options :conditions => {:method => :get} do |messages_views|
                   messages_views.connect 'boards/:board_id/topics/new', :action => 'new'
                   messages_views.connect 'boards/:board_id/topics/:id', :action => 'show'
                   messages_views.connect 'boards/:board_id/topics/:id/edit', :action => 'edit'
                 end
                 messages_routes.with_options :conditions => {:method => :post} do |messages_actions|
                   messages_actions.connect 'boards/:board_id/topics/new', :action => 'new'
                   messages_actions.connect 'boards/:board_id/topics/:id/replies', :action => 'reply'
                   messages_actions.connect 'boards/:board_id/topics/:id/:action', :action => /edit|destroy/
                 end
               end
               map.with_options :controller => 'boards' do |board_routes|
                 board_routes.with_options :conditions => {:method => :get} do |board_views|
                   board_views.connect 'projects/:project_id/boards', :action => 'index'
                   board_views.connect 'projects/:project_id/boards/new', :action => 'new'
                   board_views.connect 'projects/:project_id/boards/:id', :action => 'show'
                   board_views.connect 'projects/:project_id/boards/:id.:format', :action => 'show'
                   board_views.connect 'projects/:project_id/boards/:id/edit', :action => 'edit'
                 end
                 board_routes.with_options :conditions => {:method => :post} do |board_actions|
                   board_actions.connect 'projects/:project_id/boards', :action => 'new'
                   board_actions.connect 'projects/:project_id/boards/:id/:action', :action => /edit|destroy/
                 end
               end
               map.with_options :controller => 'documents' do |document_routes|
                 document_routes.with_options :conditions => {:method => :get} do |document_views|
                   document_views.connect 'projects/:project_id/documents', :action => 'index'
                   document_views.connect 'projects/:project_id/documents/new', :action => 'new'
                   document_views.connect 'documents/:id', :action => 'show'
                   document_views.connect 'documents/:id/edit', :action => 'edit'
                 end
                 document_routes.with_options :conditions => {:method => :post} do |document_actions|
                   document_actions.connect 'projects/:project_id/documents', :action => 'new'
                   document_actions.connect 'documents/:id/:action', :action => /destroy|edit/
                 end
               end
               map.with_options :controller => 'issues' do |issues_routes|
                 issues_routes.with_options :conditions => {:method => :get} do |issues_views|
                   issues_views.connect 'issues', :action => 'index'
                   issues_views.connect 'issues.:format', :action => 'index'
                   issues_views.connect 'projects/:project_id/issues', :action => 'index'
                   issues_views.connect 'projects/:project_id/issues.:format', :action => 'index'
                   issues_views.connect 'projects/:project_id/issues/new', :action => 'new'
                   issues_views.connect 'projects/:project_id/issues/gantt', :action => 'gantt'
                   issues_views.connect 'projects/:project_id/issues/calendar', :action => 'calendar'
                   issues_views.connect 'projects/:project_id/issues/:copy_from/copy', :action => 'new'
                   issues_views.connect 'issues/:id', :action => 'show', :id => /\d+/
                   issues_views.connect 'issues/:id.:format', :action => 'show', :id => /\d+/
                   issues_views.connect 'issues/:id/edit', :action => 'edit', :id => /\d+/
                   issues_views.connect 'issues/:id/move', :action => 'move', :id => /\d+/
                 end
                 issues_routes.with_options :conditions => {:method => :post} do |issues_actions|
                   issues_actions.connect 'projects/:project_id/issues', :action => 'new'
                   issues_actions.connect 'issues/:id/quoted', :action => 'reply', :id => /\d+/
                   issues_actions.connect 'issues/:id/:action', :action => /edit|move|destroy/, :id => /\d+/
                 end
                 issues_routes.connect 'issues/:action'
               end
               map.with_options  :controller => 'issue_relations', :conditions => {:method => :post} do |relations|
                 relations.connect 'issues/:issue_id/relations/:id', :action => 'new'
                 relations.connect 'issues/:issue_id/relations/:id/destroy', :action => 'destroy'
               end
               map.with_options :controller => 'reports', :action => 'issue_report', :conditions => {:method => :get} do |reports|
                 reports.connect 'projects/:id/issues/report'
                 reports.connect 'projects/:id/issues/report/:detail'
               end
               map.with_options :controller => 'news' do |news_routes|
                 news_routes.with_options :conditions => {:method => :get} do |news_views|
                   news_views.connect 'news', :action => 'index'
                   news_views.connect 'projects/:project_id/news', :action => 'index'
                   news_views.connect 'projects/:project_id/news.:format', :action => 'index'
                   news_views.connect 'news.:format', :action => 'index'
                   news_views.connect 'projects/:project_id/news/new', :action => 'new'
                   news_views.connect 'news/:id', :action => 'show'
                   news_views.connect 'news/:id/edit', :action => 'edit'
                 end
                 news_routes.with_options do |news_actions|
                   news_actions.connect 'projects/:project_id/news', :action => 'new'
                   news_actions.connect 'news/:id/edit', :action => 'edit'
                   news_actions.connect 'news/:id/destroy', :action => 'destroy'
                 end
               end
               map.connect 'projects/:id/members/new', :controller => 'members', :action => 'new'
               map.with_options :controller => 'users' do |users|
                 users.with_options :conditions => {:method => :get} do |user_views|
                   user_views.connect 'users', :action => 'list'
                   user_views.connect 'users', :action => 'index'
                   user_views.connect 'users/new', :action => 'add'
                   user_views.connect 'users/:id/edit/:tab', :action => 'edit', :tab => nil
                 end
                 users.with_options :conditions => {:method => :post} do |user_actions|
                   user_actions.connect 'users', :action => 'add'
                   user_actions.connect 'users/new', :action => 'add'
                   user_actions.connect 'users/:id/edit', :action => 'edit'
                   user_actions.connect 'users/:id/memberships', :action => 'edit_membership'
                   user_actions.connect 'users/:id/memberships/:membership_id', :action => 'edit_membership'
                   user_actions.connect 'users/:id/memberships/:membership_id/destroy', :action => 'destroy_membership'
                 end
               end
               map.with_options :controller => 'projects' do |projects|
                 projects.with_options :conditions => {:method => :get} do |project_views|
                   project_views.connect 'projects', :action => 'index'
                   project_views.connect 'projects.:format', :action => 'index'
                   project_views.connect 'projects/new', :action => 'add'
                   project_views.connect 'projects/:id', :action => 'show'
                   project_views.connect 'projects/:id/:action', :action => /roadmap|changelog|destroy|settings/
                   project_views.connect 'projects/:id/files', :action => 'list_files'
                   project_views.connect 'projects/:id/files/new', :action => 'add_file'
                   project_views.connect 'projects/:id/versions/new', :action => 'add_version'
                   project_views.connect 'projects/:id/categories/new', :action => 'add_issue_category'
                   project_views.connect 'projects/:id/settings/:tab', :action => 'settings'
                 end
                 projects.with_options :action => 'activity', :conditions => {:method => :get} do |activity|
                   activity.connect 'projects/:id/activity'
                   activity.connect 'projects/:id/activity.:format'
                   activity.connect 'activity', :id => nil
                   activity.connect 'activity.:format', :id => nil
                 end
                 projects.with_options :conditions => {:method => :post} do |project_actions|
                   project_actions.connect 'projects/new', :action => 'add'
                   project_actions.connect 'projects', :action => 'add'
                   project_actions.connect 'projects/:id/:action', :action => /destroy|archive|unarchive/
                   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
               map.with_options :controller => 'repositories' do |repositories|
                 repositories.with_options :conditions => {:method => :get} do |repository_views|
                   repository_views.connect 'projects/:id/repository', :action => 'show'
                   repository_views.connect 'projects/:id/repository/edit', :action => 'edit'
                   repository_views.connect 'projects/:id/repository/statistics', :action => 'stats'
                   repository_views.connect 'projects/:id/repository/revisions', :action => 'revisions'
                   repository_views.connect 'projects/:id/repository/revisions.:format', :action => 'revisions'
                   repository_views.connect 'projects/:id/repository/revisions/:rev', :action => 'revision'
                   repository_views.connect 'projects/:id/repository/revisions/:rev/diff', :action => 'diff'
                   repository_views.connect 'projects/:id/repository/revisions/:rev/diff.:format', :action => 'diff'
                   repository_views.connect 'projects/:id/repository/revisions/:rev/:action/*path', :requirements => { :rev => /[a-z0-9\.\-_]+/ }
                   repository_views.connect 'projects/:id/repository/:action/*path'
                 end
                 repositories.connect 'projects/:id/repository/:action', :conditions => {:method => :post}
               end
               map.connect 'attachments/:id', :controller => 'attachments', :action => 'show', :id => /\d+/
               map.connect 'attachments/:id/:filename', :controller => 'attachments', :action => 'show', :id => /\d+/, :filename => /.*/
               map.connect 'attachments/download/:id/:filename', :controller => 'attachments', :action => 'download', :id => /\d+/, :filename => /.*/
               map.resources :groups
               #left old routes at the bottom for backwards compat
               map.connect 'projects/:project_id/issues/:action', :controller => 'issues'
               map.connect 'projects/:project_id/documents/:action', :controller => 'documents'
               map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'
               map.connect 'boards/:board_id/topics/:action/:id', :controller => 'messages'
               map.connect 'wiki/:id/:page/:action', :page => nil, :controller => 'wiki'
               map.connect 'issues/:issue_id/relations/:action/:id', :controller => 'issue_relations'
               map.connect 'projects/:project_id/news/:action', :controller => 'news'
               map.connect 'projects/:project_id/timelog/:action/:id', :controller => 'timelog', :project_id => /.+/
               map.with_options :controller => 'repositories' do |omap|
                 omap.repositories_show 'repositories/browse/:id/*path', :action => 'browse'
                 omap.repositories_changes 'repositories/changes/:id/*path', :action => 'changes'
                 omap.repositories_diff 'repositories/diff/:id/*path', :action => 'diff'
                 omap.repositories_entry 'repositories/entry/:id/*path', :action => 'entry'
                 omap.repositories_entry 'repositories/annotate/:id/*path', :action => 'annotate'
                 omap.connect 'repositories/revision/:id/:rev', :action => 'revision'
               end
               map.with_options :controller => 'sys' do |sys|
                 sys.connect 'sys/projects.:format', :action => 'projects', :conditions => {:method => :get}
                 sys.connect 'sys/projects/:id/repository.:format', :action => 'create_project_repository', :conditions => {:method => :post}
               end
               # Install the default route as the lowest priority.
               map.connect ':controller/:action/:id'
               map.connect 'robots.txt', :controller => 'welcome', :action => 'robots'
               # Used for OpenID
               map.root :controller => 'account', :action => 'login'
             end

lib/redmine.rb +1 0

             require 'redmine/access_control'
             require 'redmine/menu_manager'
             require 'redmine/activity'
             require 'redmine/mime_type'
             require 'redmine/core_ext'
             require 'redmine/themes'
             require 'redmine/hook'
             require 'redmine/plugin'
             require 'redmine/wiki_formatting'
             begin
               require_library_or_gem 'RMagick' unless Object.const_defined?(:Magick)
             rescue LoadError
               # RMagick is not available
             end
             REDMINE_SUPPORTED_SCM = %w( Subversion Darcs Mercurial Cvs Bazaar Git Filesystem )
             # Permissions
             Redmine::AccessControl.map do |map|
               map.permission :view_project, {:projects => [:show, :activity]}, :public => true
               map.permission :search_project, {:search => :index}, :public => true
               map.permission :add_project, {:projects => :add}, :require => :loggedin
               map.permission :edit_project, {:projects => [:settings, :edit]}, :require => :member
               map.permission :select_project_modules, {:projects => :modules}, :require => :member
               map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy, :autocomplete_for_member]}, :require => :member
               map.permission :manage_versions, {:projects => [:settings, :add_version], :versions => [:edit, :destroy]}, :require => :member
               map.project_module :issue_tracking do |map|
                 # Issue categories
                 map.permission :manage_categories, {:projects => [:settings, :add_issue_category], :issue_categories => [:edit, :destroy]}, :require => :member
                 # Issues
                 map.permission :view_issues, {:projects => [:changelog, :roadmap],
                                               :issues => [:index, :changes, :show, :context_menu],
                                               :versions => [:show, :status_by],
                                               :queries => :index,
                                               :reports => :issue_report}, :public => true
                 map.permission :add_issues, {:issues => :new}
                 map.permission :edit_issues, {:issues => [:edit, :reply, :bulk_edit]}
                 map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
                 map.permission :add_issue_notes, {:issues => [:edit, :reply]}
                 map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
                 map.permission :move_issues, {:issues => :move}, :require => :loggedin
                 map.permission :delete_issues, {:issues => :destroy}, :require => :member
                 # Queries
                 map.permission :manage_public_queries, {:queries => [:new, :edit, :destroy]}, :require => :member
                 map.permission :save_queries, {:queries => [:new, :edit, :destroy]}, :require => :loggedin
                 # Gantt & calendar
                 map.permission :view_gantt, :issues => :gantt
                 map.permission :view_calendar, :issues => :calendar
                 # Watchers
                 map.permission :view_issue_watchers, {}
                 map.permission :add_issue_watchers, {:watchers => :new}
               end
               map.project_module :time_tracking do |map|
                 map.permission :log_time, {:timelog => :edit}, :require => :loggedin
                 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|
                 map.permission :manage_news, {:news => [:new, :edit, :destroy, :destroy_comment]}, :require => :member
                 map.permission :view_news, {:news => [:index, :show]}, :public => true
                 map.permission :comment_news, {:news => :add_comment}
               end
               map.project_module :documents do |map|
                 map.permission :manage_documents, {:documents => [:new, :edit, :destroy, :add_attachment]}, :require => :loggedin
                 map.permission :view_documents, :documents => [:index, :show, :download]
               end
               map.project_module :files do |map|
                 map.permission :manage_files, {:projects => :add_file}, :require => :loggedin
                 map.permission :view_files, :projects => :list_files, :versions => :download
               end
               map.project_module :wiki do |map|
                 map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member
                 map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
                 map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
                 map.permission :view_wiki_pages, :wiki => [:index, :special]
                 map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate]
                 map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment]
                 map.permission :delete_wiki_pages_attachments, {}
                 map.permission :protect_wiki_pages, {:wiki => :protect}, :require => :member
               end
               map.project_module :repository do |map|
                 map.permission :manage_repository, {:repositories => [:edit, :committers, :destroy]}, :require => :member
                 map.permission :browse_repository, :repositories => [:show, :browse, :entry, :annotate, :changes, :diff, :stats, :graph]
                 map.permission :view_changesets, :repositories => [:show, :revisions, :revision]
                 map.permission :commit_access, {}
               end
               map.project_module :boards do |map|
                 map.permission :manage_boards, {:boards => [:new, :edit, :destroy]}, :require => :member
                 map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true
                 map.permission :add_messages, {:messages => [:new, :reply, :quote]}
                 map.permission :edit_messages, {:messages => :edit}, :require => :member
                 map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin
                 map.permission :delete_messages, {:messages => :destroy}, :require => :member
                 map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin
               end
             end
             Redmine::MenuManager.map :top_menu do |menu|
               menu.push :home, :home_path
               menu.push :my_page, { :controller => 'my', :action => 'page' }, :if => Proc.new { User.current.logged? }
               menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural
               menu.push :administration, { :controller => 'admin', :action => 'index' }, :if => Proc.new { User.current.admin? }, :last => true
               menu.push :help, Redmine::Info.help_url, :last => true
             end
             Redmine::MenuManager.map :account_menu do |menu|
               menu.push :login, :signin_path, :if => Proc.new { !User.current.logged? }
               menu.push :register, { :controller => 'account', :action => 'register' }, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
               menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? }
               menu.push :logout, :signout_path, :if => Proc.new { User.current.logged? }
             end
             Redmine::MenuManager.map :application_menu do |menu|
               # Empty
             end
             Redmine::MenuManager.map :admin_menu do |menu|
               # Empty
             end
             Redmine::MenuManager.map :project_menu do |menu|
               menu.push :overview, { :controller => 'projects', :action => 'show' }
               menu.push :activity, { :controller => 'projects', :action => 'activity' }
               menu.push :roadmap, { :controller => 'projects', :action => 'roadmap' },
                           :if => Proc.new { |p| p.versions.any? }
               menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
               menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
                           :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
               menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
               menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
               menu.push :wiki, { :controller => 'wiki', :action => 'index', :page => nil },
                           :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
               menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
                           :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
               menu.push :files, { :controller => 'projects', :action => 'list_files' }, :caption => :label_attachment_plural
               menu.push :repository, { :controller => 'repositories', :action => 'show' },
                           :if => Proc.new { |p| p.repository && !p.repository.new_record? }
               menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true
             end
             Redmine::Activity.map do |activity|
               activity.register :issues, :class_name => %w(Issue Journal)
               activity.register :changesets
               activity.register :news
               activity.register :documents, :class_name => %w(Document Attachment)
               activity.register :files, :class_name => 'Attachment'
               activity.register :wiki_edits, :class_name => 'WikiContent::Version', :default => false
               activity.register :messages, :default => false
               activity.register :time_entries, :default => false
             end
             Redmine::WikiFormatting.map do |format|
               format.register :textile, Redmine::WikiFormatting::Textile::Formatter, Redmine::WikiFormatting::Textile::Helper
             end

test/fixtures/custom_values.yml +6 0

             ---
             custom_values_006:
               customized_type: Issue
               custom_field_id: 2
               customized_id: 3
               id: 6
               value: "125"
             custom_values_007:
               customized_type: Project
               custom_field_id: 3
               customized_id: 1
               id: 7
               value: Stable
             custom_values_001:
               customized_type: Principal
               custom_field_id: 4
               customized_id: 3
               id: 1
               value: ""
             custom_values_002:
               customized_type: Principal
               custom_field_id: 4
               customized_id: 4
               id: 2
               value: 01 23 45 67 89
             custom_values_003:
               customized_type: Principal
               custom_field_id: 4
               customized_id: 2
               id: 3
               value: ""
             custom_values_004:
               customized_type: Issue
               custom_field_id: 2
               customized_id: 1
               id: 4
               value: "125"
             custom_values_005:
               customized_type: Issue
               custom_field_id: 2
               customized_id: 2
               id: 5
               value: ""
             custom_values_008:
               customized_type: Issue
               custom_field_id: 1
               customized_id: 3
               id: 8
               value: "MySQL"
             custom_values_009:
               customized_type: Issue
               custom_field_id: 2
               customized_id: 3
               id: 9
               value: "this is a stringforcustomfield search"
             custom_values_010:
               customized_type: Issue
               custom_field_id: 6
               customized_id: 1
               id: 10
               value: "2.1"
             custom_values_011:
               customized_type: Issue
               custom_field_id: 6
               customized_id: 2
               id: 11
               value: "2.05"
             custom_values_012:
               customized_type: Issue
               custom_field_id: 6
               customized_id: 3
               id: 12
               value: "11.65"
             custom_values_013:
               customized_type: Issue
               custom_field_id: 6
               customized_id: 7
               id: 13
               value: ""
             custom_values_014:
               customized_type: Issue
               custom_field_id: 6
               customized_id: 5
               id: 14
               value: "-7.6"
             custom_values_015:
               customized_type: TimeEntryActivity
               custom_field_id: 7
               customized_id: 10
               id: 15
               value: true
+            custom_values_016:
+              customized_type: Enumeration
+              custom_field_id: 7
+              customized_id: 11
+              id: 16
+              value: true

test/fixtures/roles.yml +1 0

             ---
             roles_001:
               name: Manager
               id: 1
               builtin: 0
               permissions: |
                 ---
                 - :add_project
                 - :edit_project
                 - :manage_members
                 - :manage_versions
                 - :manage_categories
                 - :add_issues
                 - :edit_issues
                 - :manage_issue_relations
                 - :add_issue_notes
                 - :move_issues
                 - :delete_issues
                 - :view_issue_watchers
                 - :add_issue_watchers
                 - :manage_public_queries
                 - :save_queries
                 - :view_gantt
                 - :view_calendar
                 - :log_time
                 - :view_time_entries
                 - :edit_time_entries
                 - :delete_time_entries
                 - :manage_news
                 - :comment_news
                 - :view_documents
                 - :manage_documents
                 - :view_wiki_pages
                 - :view_wiki_edits
                 - :edit_wiki_pages
                 - :delete_wiki_pages_attachments
                 - :protect_wiki_pages
                 - :delete_wiki_pages
                 - :rename_wiki_pages
                 - :add_messages
                 - :edit_messages
                 - :delete_messages
                 - :manage_boards
                 - :view_files
                 - :manage_files
                 - :browse_repository
                 - :manage_repository
                 - :view_changesets
+                - :manage_project_activities
               position: 1
             roles_002:
               name: Developer
               id: 2
               builtin: 0
               permissions: |
                 ---
                 - :edit_project
                 - :manage_members
                 - :manage_versions
                 - :manage_categories
                 - :add_issues
                 - :edit_issues
                 - :manage_issue_relations
                 - :add_issue_notes
                 - :move_issues
                 - :delete_issues
                 - :view_issue_watchers
                 - :save_queries
                 - :view_gantt
                 - :view_calendar
                 - :log_time
                 - :view_time_entries
                 - :edit_own_time_entries
                 - :manage_news
                 - :comment_news
                 - :view_documents
                 - :manage_documents
                 - :view_wiki_pages
                 - :view_wiki_edits
                 - :edit_wiki_pages
                 - :protect_wiki_pages
                 - :delete_wiki_pages
                 - :add_messages
                 - :edit_own_messages
                 - :delete_own_messages
                 - :manage_boards
                 - :view_files
                 - :manage_files
                 - :browse_repository
                 - :view_changesets
               position: 2
             roles_003:
               name: Reporter
               id: 3
               builtin: 0
               permissions: |
                 ---
                 - :edit_project
                 - :manage_members
                 - :manage_versions
                 - :manage_categories
                 - :add_issues
                 - :edit_issues
                 - :manage_issue_relations
                 - :add_issue_notes
                 - :move_issues
                 - :view_issue_watchers
                 - :save_queries
                 - :view_gantt
                 - :view_calendar
                 - :log_time
                 - :view_time_entries
                 - :manage_news
                 - :comment_news
                 - :view_documents
                 - :manage_documents
                 - :view_wiki_pages
                 - :view_wiki_edits
                 - :edit_wiki_pages
                 - :delete_wiki_pages
                 - :add_messages
                 - :manage_boards
                 - :view_files
                 - :manage_files
                 - :browse_repository
                 - :view_changesets
               position: 3
             roles_004:
               name: Non member
               id: 4
               builtin: 1
               permissions: |
                 ---
                 - :add_issues
                 - :edit_issues
                 - :manage_issue_relations
                 - :add_issue_notes
                 - :move_issues
                 - :save_queries
                 - :view_gantt
                 - :view_calendar
                 - :log_time
                 - :view_time_entries
                 - :comment_news
                 - :view_documents
                 - :manage_documents
                 - :view_wiki_pages
                 - :view_wiki_edits
                 - :edit_wiki_pages
                 - :add_messages
                 - :view_files
                 - :manage_files
                 - :browse_repository
                 - :view_changesets
               position: 4
             roles_005:
               name: Anonymous
               id: 5
               builtin: 2
               permissions: |
                 ---
                 - :add_issue_notes
                 - :view_gantt
                 - :view_calendar
                 - :view_time_entries
                 - :view_documents
                 - :view_wiki_pages
                 - :view_wiki_edits
                 - :view_files
                 - :browse_repository
                 - :view_changesets
               position: 5

test/functional/projects_controller_test.rb +128 -1

             # Redmine - project management software
             # Copyright (C) 2006-2008  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             require 'projects_controller'
             # Re-raise errors caught by the controller.
             class ProjectsController; def rescue_action(e) raise e end; end
             class ProjectsControllerTest < ActionController::TestCase
               fixtures :projects, :versions, :users, :roles, :members, :member_roles, :issues, :journals, :journal_details,
                        :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages,
-                       :attachments
+                       :attachments, :custom_fields, :custom_values
               def setup
                 @controller = ProjectsController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 @request.session[:user_id] = nil
                 Setting.default_language = 'en'
               end
               def test_index_routing
                 assert_routing(
                   {:method => :get, :path => '/projects'},
                   :controller => 'projects', :action => 'index'
                 )
               end
               def test_index
                 get :index
                 assert_response :success
                 assert_template 'index'
                 assert_not_nil assigns(:projects)
                 assert_tag :ul, :child => {:tag => 'li',
                                            :descendant => {:tag => 'a', :content => 'eCookbook'},
                                            :child => { :tag => 'ul',
                                                        :descendant => { :tag => 'a',
                                                                         :content => 'Child of private child'
                                                                        }
                                                       }
                                            }
                 assert_no_tag :a, :content => /Private child of eCookbook/
               end
               def test_index_atom_routing
                 assert_routing(
                   {:method => :get, :path => '/projects.atom'},
                   :controller => 'projects', :action => 'index', :format => 'atom'
                 )
               end
               def test_index_atom
                 get :index, :format => 'atom'
                 assert_response :success
                 assert_template 'common/feed.atom.rxml'
                 assert_select 'feed>title', :text => 'Redmine: Latest projects'
                 assert_select 'feed>entry', :count => Project.count(:conditions => Project.visible_by(User.current))
               end
               def test_add_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/new'},
                   :controller => 'projects', :action => 'add'
                 )
                 assert_recognizes(
                   {:controller => 'projects', :action => 'add'},
                   {:method => :post, :path => '/projects/new'}
                 )
                 assert_recognizes(
                   {:controller => 'projects', :action => 'add'},
                   {:method => :post, :path => '/projects'}
                 )
               end
               def test_get_add
                 @request.session[:user_id] = 1
                 get :add
                 assert_response :success
                 assert_template 'add'
               end
               def test_get_add_by_non_admin
                 @request.session[:user_id] = 2
                 get :add
                 assert_response :success
                 assert_template 'add'
               end
               def test_post_add
                 @request.session[:user_id] = 1
                 post :add, :project => { :name => "blog",
                                          :description => "weblog",
                                          :identifier => "blog",
                                          :is_public => 1,
                                          :custom_field_values => { '3' => 'Beta' }
                                         }
                 assert_redirected_to '/projects/blog/settings'
                 project = Project.find_by_name('blog')
                 assert_kind_of Project, project
                 assert_equal 'weblog', project.description
                 assert_equal true, project.is_public?
               end
               def test_post_add_by_non_admin
                 @request.session[:user_id] = 2
                 post :add, :project => { :name => "blog",
                                          :description => "weblog",
                                          :identifier => "blog",
                                          :is_public => 1,
                                          :custom_field_values => { '3' => 'Beta' }
                                         }
                 assert_redirected_to '/projects/blog/settings'
                 project = Project.find_by_name('blog')
                 assert_kind_of Project, project
                 assert_equal 'weblog', project.description
                 assert_equal true, project.is_public?
                 # User should be added as a project member
                 assert User.find(2).member_of?(project)
                 assert_equal 1, project.members.size
               end
               def test_show_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/test'},
                   :controller => 'projects', :action => 'show', :id => 'test'
                 )
               end
               def test_show_by_id
                 get :show, :id => 1
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:project)
               end
               def test_show_by_identifier
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:project)
                 assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)
               end
               def test_show_should_not_fail_when_custom_values_are_nil
                 project = Project.find_by_identifier('ecookbook')
                 project.custom_values.first.update_attribute(:value, nil)
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_not_nil assigns(:project)
                 assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)
               end
               def test_private_subprojects_hidden
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_no_tag :tag => 'a', :content => /Private child/
               end
               def test_private_subprojects_visible
                 @request.session[:user_id] = 2 # manager who is a member of the private subproject
                 get :show, :id => 'ecookbook'
                 assert_response :success
                 assert_template 'show'
                 assert_tag :tag => 'a', :content => /Private child/
               end
               def test_settings_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/4223/settings'},
                   :controller => 'projects', :action => 'settings', :id => '4223'
                 )
                 assert_routing(
                   {:method => :get, :path => '/projects/4223/settings/members'},
                   :controller => 'projects', :action => 'settings', :id => '4223', :tab => 'members'
                 )
               end
               def test_settings
                 @request.session[:user_id] = 2 # manager
                 get :settings, :id => 1
                 assert_response :success
                 assert_template 'settings'
               end
               def test_edit
                 @request.session[:user_id] = 2 # manager
                 post :edit, :id => 1, :project => {:name => 'Test changed name',
                                                    :issue_custom_field_ids => ['']}
                 assert_redirected_to 'projects/ecookbook/settings'
                 project = Project.find(1)
                 assert_equal 'Test changed name', project.name
               end
               def test_add_version_routing
                 assert_routing(
                   {:method => :get, :path => 'projects/64/versions/new'},
                   :controller => 'projects', :action => 'add_version', :id => '64'
                 )
                 assert_routing(
                 #TODO: use PUT
                   {:method => :post, :path => 'projects/64/versions/new'},
                   :controller => 'projects', :action => 'add_version', :id => '64'
                 )
               end
               def test_add_issue_category_routing
                 assert_routing(
                   {:method => :get, :path => 'projects/test/categories/new'},
                   :controller => 'projects', :action => 'add_issue_category', :id => 'test'
                 )
                 assert_routing(
                 #TODO: use PUT and update form
                   {:method => :post, :path => 'projects/64/categories/new'},
                   :controller => 'projects', :action => 'add_issue_category', :id => '64'
                 )
               end
               def test_destroy_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/567/destroy'},
                   :controller => 'projects', :action => 'destroy', :id => '567'
                 )
                 assert_routing(
                 #TODO: use DELETE and update form
                   {:method => :post, :path => 'projects/64/destroy'},
                   :controller => 'projects', :action => 'destroy', :id => '64'
                 )
               end
               def test_get_destroy
                 @request.session[:user_id] = 1 # admin
                 get :destroy, :id => 1
                 assert_response :success
                 assert_template 'destroy'
                 assert_not_nil Project.find_by_id(1)
               end
               def test_post_destroy
                 @request.session[:user_id] = 1 # admin
                 post :destroy, :id => 1, :confirm => 1
                 assert_redirected_to 'admin/projects'
                 assert_nil Project.find_by_id(1)
               end
               def test_add_file
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 Setting.notified_events = ['file_added']
                 ActionMailer::Base.deliveries.clear
                 assert_difference 'Attachment.count' do
                   post :add_file, :id => 1, :version_id => '',
                        :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
                 end
                 assert_redirected_to 'projects/ecookbook/files'
                 a = Attachment.find(:first, :order => 'created_on DESC')
                 assert_equal 'testfile.txt', a.filename
                 assert_equal Project.find(1), a.container
                 mail = ActionMailer::Base.deliveries.last
                 assert_kind_of TMail::Mail, mail
                 assert_equal "[eCookbook] New file", mail.subject
                 assert mail.body.include?('testfile.txt')
               end
               def test_add_file_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/33/files/new'},
                   :controller => 'projects', :action => 'add_file', :id => '33'
                 )
                 assert_routing(
                   {:method => :post, :path => '/projects/33/files/new'},
                   :controller => 'projects', :action => 'add_file', :id => '33'
                 )
               end
               def test_add_version_file
                 set_tmp_attachments_directory
                 @request.session[:user_id] = 2
                 Setting.notified_events = ['file_added']
                 assert_difference 'Attachment.count' do
                   post :add_file, :id => 1, :version_id => '2',
                        :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
                 end
                 assert_redirected_to 'projects/ecookbook/files'
                 a = Attachment.find(:first, :order => 'created_on DESC')
                 assert_equal 'testfile.txt', a.filename
                 assert_equal Version.find(2), a.container
               end
               def test_list_files
                 get :list_files, :id => 1
                 assert_response :success
                 assert_template 'list_files'
                 assert_not_nil assigns(:containers)
                 # file attached to the project
                 assert_tag :a, :content => 'project_file.zip',
                                :attributes => { :href => '/attachments/download/8/project_file.zip' }
                 # file attached to a project's version
                 assert_tag :a, :content => 'version_file.zip',
                                :attributes => { :href => '/attachments/download/9/version_file.zip' }
               end
               def test_list_files_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/33/files'},
                   :controller => 'projects', :action => 'list_files', :id => '33'
                 )
               end
               def test_changelog_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/44/changelog'},
                   :controller => 'projects', :action => 'changelog', :id => '44'
                 )
               end
               def test_changelog
                 get :changelog, :id => 1
                 assert_response :success
                 assert_template 'changelog'
                 assert_not_nil assigns(:versions)
               end
               def test_roadmap_routing
                 assert_routing(
                   {:method => :get, :path => 'projects/33/roadmap'},
                   :controller => 'projects', :action => 'roadmap', :id => '33'
                 )
               end
               def test_roadmap
                 get :roadmap, :id => 1
                 assert_response :success
                 assert_template 'roadmap'
                 assert_not_nil assigns(:versions)
                 # Version with no date set appears
                 assert assigns(:versions).include?(Version.find(3))
                 # Completed version doesn't appear
                 assert !assigns(:versions).include?(Version.find(1))
               end
               def test_roadmap_with_completed_versions
                 get :roadmap, :id => 1, :completed => 1
                 assert_response :success
                 assert_template 'roadmap'
                 assert_not_nil assigns(:versions)
                 # Version with no date set appears
                 assert assigns(:versions).include?(Version.find(3))
                 # Completed version appears
                 assert assigns(:versions).include?(Version.find(1))
               end
               def test_project_activity_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/1/activity'},
                    :controller => 'projects', :action => 'activity', :id => '1'
                 )
               end
               def test_project_activity_atom_routing
                 assert_routing(
                   {:method => :get, :path => '/projects/1/activity.atom'},
                    :controller => 'projects', :action => 'activity', :id => '1', :format => 'atom'
                 )
               end
               def test_project_activity
                 get :activity, :id => 1, :with_subprojects => 0
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{2.days.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => /issue-edit/ },
                                :child => { :tag => "a",
                                  :content => /(#{IssueStatus.find(2).name})/,
                                }
                              }
                            }
               end
               def test_previous_project_activity
                 get :activity, :id => 1, :from => 3.days.ago.to_date
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{3.day.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => /issue/ },
                                :child => { :tag => "a",
                                  :content => /#{Issue.find(1).subject}/,
                                }
                              }
                            }
               end
               def test_global_activity_routing
                 assert_routing({:method => :get, :path => '/activity'}, :controller => 'projects', :action => 'activity', :id => nil)
               end
               def test_global_activity
                 get :activity
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{5.day.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => /issue/ },
                                :child => { :tag => "a",
                                  :content => /#{Issue.find(5).subject}/,
                                }
                              }
                            }
               end
               def test_user_activity
                 get :activity, :user_id => 2
                 assert_response :success
                 assert_template 'activity'
                 assert_not_nil assigns(:events_by_day)
                 assert_tag :tag => "h3",
                            :content => /#{3.day.ago.to_date.day}/,
                            :sibling => { :tag => "dl",
                              :child => { :tag => "dt",
                                :attributes => { :class => /issue/ },
                                :child => { :tag => "a",
                                  :content => /#{Issue.find(1).subject}/,
                                }
                              }
                            }
               end
               def test_global_activity_atom_routing
                 assert_routing({:method => :get, :path => '/activity.atom'}, :controller => 'projects', :action => 'activity', :id => nil, :format => 'atom')
               end
               def test_activity_atom_feed
                 get :activity, :format => 'atom'
                 assert_response :success
                 assert_template 'common/feed.atom.rxml'
               end
               def test_archive_routing
                 assert_routing(
                 #TODO: use PUT to project path and modify form
                   {:method => :post, :path => 'projects/64/archive'},
                   :controller => 'projects', :action => 'archive', :id => '64'
                 )
               end
               def test_archive
                 @request.session[:user_id] = 1 # admin
                 post :archive, :id => 1
                 assert_redirected_to 'admin/projects'
                 assert !Project.find(1).active?
               end
               def test_unarchive_routing
                 assert_routing(
                 #TODO: use PUT to project path and modify form
                   {:method => :post, :path => '/projects/567/unarchive'},
                   :controller => 'projects', :action => 'unarchive', :id => '567'
                 )
               end
               def test_unarchive
                 @request.session[:user_id] = 1 # admin
                 Project.find(1).archive
                 post :unarchive, :id => 1
                 assert_redirected_to 'admin/projects'
                 assert Project.find(1).active?
               end
               def test_project_breadcrumbs_should_be_limited_to_3_ancestors
                 CustomField.delete_all
                 parent = nil
 .times do |i|
                   p = Project.create!(:name => "Breadcrumbs #{i}", :identifier => "breadcrumbs-#{i}")
                   p.set_parent!(parent)
                   get :show, :id => p
                   assert_tag :h1, :parent => { :attributes => {:id => 'header'}},
                                   :children => { :count => [i, 3].min,
                                                  :only => { :tag => 'a' } }
                   parent = p
                 end
               end
               def test_copy_with_project
                 @request.session[:user_id] = 1 # admin
                 get :copy, :id => 1
                 assert_response :success
                 assert_template 'copy'
                 assert assigns(:project)
                 assert_equal Project.find(1).description, assigns(:project).description
                 assert_nil assigns(:project).id
               end
               def test_copy_without_project
                 @request.session[:user_id] = 1 # admin
                 get :copy
                 assert_response :redirect
                 assert_redirected_to :controller => 'admin', :action => 'projects'
               end
               def test_jump_should_redirect_to_active_tab
                 get :show, :id => 1, :jump => 'issues'
                 assert_redirected_to 'projects/ecookbook/issues'
               end
               def test_jump_should_not_redirect_to_inactive_tab
                 get :show, :id => 3, :jump => 'documents'
                 assert_response :success
                 assert_template 'show'
               end
               def test_jump_should_not_redirect_to_unknown_tab
                 get :show, :id => 3, :jump => 'foobar'
                 assert_response :success
                 assert_template 'show'
               end
+              def test_reset_activities_routing
+                assert_routing({:method => :delete, :path => 'projects/64/reset_activities'},
+                               :controller => 'projects', :action => 'reset_activities', :id => '64')
+              end
+              def test_reset_activities
+                @request.session[:user_id] = 2 # manager
+                project_activity = TimeEntryActivity.new({
+                                                           :name => 'Project Specific',
+                                                           :parent => TimeEntryActivity.find(:first),
+                                                           :project => Project.find(1),
+                                                           :active => true
+                                                         })
+                assert project_activity.save
+                project_activity_two = TimeEntryActivity.new({
+                                                               :name => 'Project Specific Two',
+                                                               :parent => TimeEntryActivity.find(:last),
+                                                               :project => Project.find(1),
+                                                               :active => true
+                                                             })
+                assert project_activity_two.save
+                delete :reset_activities, :id => 1
+                assert_response :redirect
+                assert_redirected_to 'projects/ecookbook/settings/activities'
+                assert_nil TimeEntryActivity.find_by_id(project_activity.id)
+                assert_nil TimeEntryActivity.find_by_id(project_activity_two.id)
+              end
+              def test_save_activities_routing
+                assert_routing({:method => :post, :path => 'projects/64/activities/save'},
+                               :controller => 'projects', :action => 'save_activities', :id => '64')
+              end
+              def test_save_activities_to_override_system_activities
+                @request.session[:user_id] = 2 # manager
+                billable_field = TimeEntryActivityCustomField.find_by_name("Billable")
+                post :save_activities, :id => 1, :enumerations => {
+                  "9"=> {"parent_id"=>"9", "custom_field_values"=>{"7" => "1"}, "active"=>"0"}, # Design, De-activate
+                  "10"=> {"parent_id"=>"10", "custom_field_values"=>{"7"=>"0"}, "active"=>"1"}, # Development, Change custom value
+                  "14"=>{"parent_id"=>"14", "custom_field_values"=>{"7"=>"1"}, "active"=>"1"}, # Inactive Activity, Activate with custom value
+                  "11"=>{"parent_id"=>"11", "custom_field_values"=>{"7"=>"1"}, "active"=>"1"} # QA, no changes
+                }
+                assert_response :redirect
+                assert_redirected_to 'projects/ecookbook/settings/activities'
+                # Created project specific activities...
+                project = Project.find('ecookbook')
+                # ... Design
+                design = project.time_entry_activities.find_by_name("Design")
+                assert design, "Project activity not found"
+                assert_equal 9, design.parent_id # Relate to the system activity
+                assert_not_equal design.parent.id, design.id # Different records
+                assert_equal design.parent.name, design.name # Same name
+                assert !design.active?
+                # ... Development
+                development = project.time_entry_activities.find_by_name("Development")
+                assert development, "Project activity not found"
+                assert_equal 10, development.parent_id # Relate to the system activity
+                assert_not_equal development.parent.id, development.id # Different records
+                assert_equal development.parent.name, development.name # Same name
+                assert development.active?
+                assert_equal "0", development.custom_value_for(billable_field).value
+                # ... Inactive Activity
+                previously_inactive = project.time_entry_activities.find_by_name("Inactive Activity")
+                assert previously_inactive, "Project activity not found"
+                assert_equal 14, previously_inactive.parent_id # Relate to the system activity
+                assert_not_equal previously_inactive.parent.id, previously_inactive.id # Different records
+                assert_equal previously_inactive.parent.name, previously_inactive.name # Same name
+                assert previously_inactive.active?
+                assert_equal "1", previously_inactive.custom_value_for(billable_field).value
+                # ... QA
+                assert_equal nil, project.time_entry_activities.find_by_name("QA"), "Custom QA activity created when it wasn't modified"
+              end
+              def test_save_activities_will_update_project_specific_activities
+                @request.session[:user_id] = 2 # manager
+                project_activity = TimeEntryActivity.new({
+                                                           :name => 'Project Specific',
+                                                           :parent => TimeEntryActivity.find(:first),
+                                                           :project => Project.find(1),
+                                                           :active => true
+                                                         })
+                assert project_activity.save
+                project_activity_two = TimeEntryActivity.new({
+                                                               :name => 'Project Specific Two',
+                                                               :parent => TimeEntryActivity.find(:last),
+                                                               :project => Project.find(1),
+                                                               :active => true
+                                                             })
+                assert project_activity_two.save
+                post :save_activities, :id => 1, :enumerations => {
+                  project_activity.id => {"custom_field_values"=>{"7" => "1"}, "active"=>"0"}, # De-activate
+                  project_activity_two.id => {"custom_field_values"=>{"7" => "1"}, "active"=>"0"} # De-activate
+                }
+                assert_response :redirect
+                assert_redirected_to 'projects/ecookbook/settings/activities'
+                # Created project specific activities...
+                project = Project.find('ecookbook')
+                assert_equal 2, project.time_entry_activities.count
+                activity_one = project.time_entry_activities.find_by_name(project_activity.name)
+                assert activity_one, "Project activity not found"
+                assert_equal project_activity.id, activity_one.id
+                assert !activity_one.active?
+                activity_two = project.time_entry_activities.find_by_name(project_activity_two.name)
+                assert activity_two, "Project activity not found"
+                assert_equal project_activity_two.id, activity_two.id
+                assert !activity_two.active?
+              end
               # A hook that is manually registered later
               class ProjectBasedTemplate < Redmine::Hook::ViewListener
                 def view_layouts_base_html_head(context)
                   # Adds a project stylesheet
                   stylesheet_link_tag(context[:project].identifier) if context[:project]
                 end
               end
               # Don't use this hook now
               Redmine::Hook.clear_listeners
               def test_hook_response
                 Redmine::Hook.add_listener(ProjectBasedTemplate)
                 get :show, :id => 1
                 assert_tag :tag => 'link', :attributes => {:href => '/stylesheets/ecookbook.css'},
                                            :parent => {:tag => 'head'}
                 Redmine::Hook.clear_listeners
               end
             end

test/unit/project_test.rb +15 0

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             class ProjectTest < ActiveSupport::TestCase
               fixtures :projects, :enabled_modules,
                        :issues, :issue_statuses, :journals, :journal_details,
                        :users, :members, :member_roles, :roles, :projects_trackers, :trackers, :boards,
                        :queries
               def setup
                 @ecookbook = Project.find(1)
                 @ecookbook_sub1 = Project.find(3)
               end
               should_validate_presence_of :name
               should_validate_presence_of :identifier
               should_validate_uniqueness_of :name
               should_validate_uniqueness_of :identifier
               context "associations" do
                 should_have_many :members
                 should_have_many :users, :through => :members
                 should_have_many :member_principals
                 should_have_many :principals, :through => :member_principals
                 should_have_many :enabled_modules
                 should_have_many :issues
                 should_have_many :issue_changes, :through => :issues
                 should_have_many :versions
                 should_have_many :time_entries
                 should_have_many :queries
                 should_have_many :documents
                 should_have_many :news
                 should_have_many :issue_categories
                 should_have_many :boards
                 should_have_many :changesets, :through => :repository
                 should_have_one :repository
                 should_have_one :wiki
                 should_have_and_belong_to_many :trackers
                 should_have_and_belong_to_many :issue_custom_fields
               end
               def test_truth
                 assert_kind_of Project, @ecookbook
                 assert_equal "eCookbook", @ecookbook.name
               end
               def test_update
                 assert_equal "eCookbook", @ecookbook.name
                 @ecookbook.name = "eCook"
                 assert @ecookbook.save, @ecookbook.errors.full_messages.join("; ")
                 @ecookbook.reload
                 assert_equal "eCook", @ecookbook.name
               end
               def test_validate_identifier
                 to_test = {"abc" => true,
                            "ab12" => true,
                            "ab-12" => true,
                            "12" => false,
                            "new" => false}
                 to_test.each do |identifier, valid|
                   p = Project.new
                   p.identifier = identifier
                   p.valid?
                   assert_equal valid, p.errors.on('identifier').nil?
                 end
               end
               def test_members_should_be_active_users
                 Project.all.each do |project|
                   assert_nil project.members.detect {|m| !(m.user.is_a?(User) && m.user.active?) }
                 end
               end
               def test_users_should_be_active_users
                 Project.all.each do |project|
                   assert_nil project.users.detect {|u| !(u.is_a?(User) && u.active?) }
                 end
               end
               def test_archive
                 user = @ecookbook.members.first.user
                 @ecookbook.archive
                 @ecookbook.reload
                 assert !@ecookbook.active?
                 assert !user.projects.include?(@ecookbook)
                 # Subproject are also archived
                 assert !@ecookbook.children.empty?
                 assert @ecookbook.descendants.active.empty?
               end
               def test_unarchive
                 user = @ecookbook.members.first.user
                 @ecookbook.archive
                 # A subproject of an archived project can not be unarchived
                 assert !@ecookbook_sub1.unarchive
                 # Unarchive project
                 assert @ecookbook.unarchive
                 @ecookbook.reload
                 assert @ecookbook.active?
                 assert user.projects.include?(@ecookbook)
                 # Subproject can now be unarchived
                 @ecookbook_sub1.reload
                 assert @ecookbook_sub1.unarchive
               end
               def test_destroy
                 # 2 active members
                 assert_equal 2, @ecookbook.members.size
                 # and 1 is locked
                 assert_equal 3, Member.find(:all, :conditions => ['project_id = ?', @ecookbook.id]).size
                 # some boards
                 assert @ecookbook.boards.any?
                 @ecookbook.destroy
                 # make sure that the project non longer exists
                 assert_raise(ActiveRecord::RecordNotFound) { Project.find(@ecookbook.id) }
                 # make sure related data was removed
                 assert Member.find(:all, :conditions => ['project_id = ?', @ecookbook.id]).empty?
                 assert Board.find(:all, :conditions => ['project_id = ?', @ecookbook.id]).empty?
               end
               def test_move_an_orphan_project_to_a_root_project
                 sub = Project.find(2)
                 sub.set_parent! @ecookbook
                 assert_equal @ecookbook.id, sub.parent.id
                 @ecookbook.reload
                 assert_equal 4, @ecookbook.children.size
               end
               def test_move_an_orphan_project_to_a_subproject
                 sub = Project.find(2)
                 assert sub.set_parent!(@ecookbook_sub1)
               end
               def test_move_a_root_project_to_a_project
                 sub = @ecookbook
                 assert sub.set_parent!(Project.find(2))
               end
               def test_should_not_move_a_project_to_its_children
                 sub = @ecookbook
                 assert !(sub.set_parent!(Project.find(3)))
               end
               def test_set_parent_should_add_roots_in_alphabetical_order
                 ProjectCustomField.delete_all
                 Project.delete_all
                 Project.create!(:name => 'Project C', :identifier => 'project-c').set_parent!(nil)
                 Project.create!(:name => 'Project B', :identifier => 'project-b').set_parent!(nil)
                 Project.create!(:name => 'Project D', :identifier => 'project-d').set_parent!(nil)
                 Project.create!(:name => 'Project A', :identifier => 'project-a').set_parent!(nil)
                 assert_equal 4, Project.count
                 assert_equal Project.all.sort_by(&:name), Project.all.sort_by(&:lft)
               end
               def test_set_parent_should_add_children_in_alphabetical_order
                 ProjectCustomField.delete_all
                 parent = Project.create!(:name => 'Parent', :identifier => 'parent')
                 Project.create!(:name => 'Project C', :identifier => 'project-c').set_parent!(parent)
                 Project.create!(:name => 'Project B', :identifier => 'project-b').set_parent!(parent)
                 Project.create!(:name => 'Project D', :identifier => 'project-d').set_parent!(parent)
                 Project.create!(:name => 'Project A', :identifier => 'project-a').set_parent!(parent)
                 parent.reload
                 assert_equal 4, parent.children.size
                 assert_equal parent.children.sort_by(&:name), parent.children
               end
               def test_rebuild_should_sort_children_alphabetically
                 ProjectCustomField.delete_all
                 parent = Project.create!(:name => 'Parent', :identifier => 'parent')
                 Project.create!(:name => 'Project C', :identifier => 'project-c').move_to_child_of(parent)
                 Project.create!(:name => 'Project B', :identifier => 'project-b').move_to_child_of(parent)
                 Project.create!(:name => 'Project D', :identifier => 'project-d').move_to_child_of(parent)
                 Project.create!(:name => 'Project A', :identifier => 'project-a').move_to_child_of(parent)
                 Project.update_all("lft = NULL, rgt = NULL")
                 Project.rebuild!
                 parent.reload
                 assert_equal 4, parent.children.size
                 assert_equal parent.children.sort_by(&:name), parent.children
               end
               def test_parent
                 p = Project.find(6).parent
                 assert p.is_a?(Project)
                 assert_equal 5, p.id
               end
               def test_ancestors
                 a = Project.find(6).ancestors
                 assert a.first.is_a?(Project)
                 assert_equal [1, 5], a.collect(&:id)
               end
               def test_root
                 r = Project.find(6).root
                 assert r.is_a?(Project)
                 assert_equal 1, r.id
               end
               def test_children
                 c = Project.find(1).children
                 assert c.first.is_a?(Project)
                 assert_equal [5, 3, 4], c.collect(&:id)
               end
               def test_descendants
                 d = Project.find(1).descendants
                 assert d.first.is_a?(Project)
                 assert_equal [5, 6, 3, 4], d.collect(&:id)
               end
               def test_users_by_role
                 users_by_role = Project.find(1).users_by_role
                 assert_kind_of Hash, users_by_role
                 role = Role.find(1)
                 assert_kind_of Array, users_by_role[role]
                 assert users_by_role[role].include?(User.find(2))
               end
               def test_rolled_up_trackers
                 parent = Project.find(1)
                 parent.trackers = Tracker.find([1,2])
                 child = parent.children.find(3)
                 assert_equal [1, 2], parent.tracker_ids
                 assert_equal [2, 3], child.trackers.collect(&:id)
                 assert_kind_of Tracker, parent.rolled_up_trackers.first
                 assert_equal Tracker.find(1), parent.rolled_up_trackers.first
                 assert_equal [1, 2, 3], parent.rolled_up_trackers.collect(&:id)
                 assert_equal [2, 3], child.rolled_up_trackers.collect(&:id)
               end
               def test_rolled_up_trackers_should_ignore_archived_subprojects
                 parent = Project.find(1)
                 parent.trackers = Tracker.find([1,2])
                 child = parent.children.find(3)
                 child.trackers = Tracker.find([1,3])
                 parent.children.each(&:archive)
                 assert_equal [1,2], parent.rolled_up_trackers.collect(&:id)
               end
               def test_next_identifier
                 ProjectCustomField.delete_all
                 Project.create!(:name => 'last', :identifier => 'p2008040')
                 assert_equal 'p2008041', Project.next_identifier
               end
               def test_next_identifier_first_project
                 Project.delete_all
                 assert_nil Project.next_identifier
               end
               def test_enabled_module_names_should_not_recreate_enabled_modules
                 project = Project.find(1)
                 # Remove one module
                 modules = project.enabled_modules.slice(0..-2)
                 assert modules.any?
                 assert_difference 'EnabledModule.count', -1 do
                   project.enabled_module_names = modules.collect(&:name)
                 end
                 project.reload
                 # Ids should be preserved
                 assert_equal project.enabled_module_ids.sort, modules.collect(&:id).sort
               end
               def test_copy_from_existing_project
                 source_project = Project.find(1)
                 copied_project = Project.copy_from(1)
                 assert copied_project
                 # Cleared attributes
                 assert copied_project.id.blank?
                 assert copied_project.name.blank?
                 assert copied_project.identifier.blank?
                 # Duplicated attributes
                 assert_equal source_project.description, copied_project.description
                 assert_equal source_project.enabled_modules, copied_project.enabled_modules
                 assert_equal source_project.trackers, copied_project.trackers
                 # Default attributes
                 assert_equal 1, copied_project.status
               end
               def test_activities_should_use_the_system_activities
                 project = Project.find(1)
                 assert_equal project.activities, TimeEntryActivity.find(:all, :conditions => {:active => true} )
               end
               def test_activities_should_use_the_project_specific_activities
                 project = Project.find(1)
                 overridden_activity = TimeEntryActivity.new({:name => "Project", :project => project})
                 assert overridden_activity.save!
                 assert project.activities.include?(overridden_activity), "Project specific Activity not found"
               end
               def test_activities_should_not_include_the_inactive_project_specific_activities
                 project = Project.find(1)
                 overridden_activity = TimeEntryActivity.new({:name => "Project", :project => project, :parent => TimeEntryActivity.find(:first), :active => false})
                 assert overridden_activity.save!
                 assert !project.activities.include?(overridden_activity), "Inactive Project specific Activity found"
               end
               def test_activities_should_not_include_project_specific_activities_from_other_projects
                 project = Project.find(1)
                 overridden_activity = TimeEntryActivity.new({:name => "Project", :project => Project.find(2)})
                 assert overridden_activity.save!
                 assert !project.activities.include?(overridden_activity), "Project specific Activity found on a different project"
               end
               def test_activities_should_handle_nils
+                overridden_activity = TimeEntryActivity.new({:name => "Project", :project => Project.find(1), :parent => TimeEntryActivity.find(:first)})
                 TimeEntryActivity.delete_all
+                # No activities
                 project = Project.find(1)
                 assert project.activities.empty?
+                # No system, one overridden
+                assert overridden_activity.save!
+                project.reload
+                assert_equal [overridden_activity], project.activities
               end
               def test_activities_should_override_system_activities_with_project_activities
                 project = Project.find(1)
                 parent_activity = TimeEntryActivity.find(:first)
                 overridden_activity = TimeEntryActivity.new({:name => "Project", :project => project, :parent => parent_activity})
                 assert overridden_activity.save!
                 assert project.activities.include?(overridden_activity), "Project specific Activity not found"
                 assert !project.activities.include?(parent_activity), "System Activity found when it should have been overridden"
               end
+              def test_activities_should_include_inactive_activities_if_specified
+                project = Project.find(1)
+                overridden_activity = TimeEntryActivity.new({:name => "Project", :project => project, :parent => TimeEntryActivity.find(:first), :active => false})
+                assert overridden_activity.save!
+                assert project.activities(true).include?(overridden_activity), "Inactive Project specific Activity not found"
+              end
               context "Project#copy" do
                 setup do
                   ProjectCustomField.destroy_all # Custom values are a mess to isolate in tests
                   Project.destroy_all :identifier => "copy-test"
                   @source_project = Project.find(2)
                   @project = Project.new(:name => 'Copy Test', :identifier => 'copy-test')
                   @project.trackers = @source_project.trackers
                   @project.enabled_modules = @source_project.enabled_modules
                 end
                 should "copy issues" do
                   assert @project.valid?
                   assert @project.issues.empty?
                   assert @project.copy(@source_project)
                   assert_equal @source_project.issues.size, @project.issues.size
                   @project.issues.each do |issue|
                     assert issue.valid?
                     assert ! issue.assigned_to.blank?
                     assert_equal @project, issue.project
                   end
                 end
                 should "change the new issues to use the copied version" do
                   assigned_version = Version.generate!(:name => "Assigned Issues")
                   @source_project.versions << assigned_version
                   assert_equal 1, @source_project.versions.size
                   @source_project.issues << Issue.generate!(:fixed_version_id => assigned_version.id,
                                                             :subject => "change the new issues to use the copied version",
                                                             :tracker_id => 1,
                                                             :project_id => @source_project.id)
                   assert @project.copy(@source_project)
                   @project.reload
                   copied_issue = @project.issues.first(:conditions => {:subject => "change the new issues to use the copied version"})
                   assert copied_issue
                   assert copied_issue.fixed_version
                   assert_equal "Assigned Issues", copied_issue.fixed_version.name # Same name
                   assert_not_equal assigned_version.id, copied_issue.fixed_version.id # Different record
                 end
                 should "copy members" do
                   assert @project.valid?
                   assert @project.members.empty?
                   assert @project.copy(@source_project)
                   assert_equal @source_project.members.size, @project.members.size
                   @project.members.each do |member|
                     assert member
                     assert_equal @project, member.project
                   end
                 end
                 should "copy project specific queries" do
                   assert @project.valid?
                   assert @project.queries.empty?
                   assert @project.copy(@source_project)
                   assert_equal @source_project.queries.size, @project.queries.size
                   @project.queries.each do |query|
                     assert query
                     assert_equal @project, query.project
                   end
                 end
                 should "copy versions" do
                   @source_project.versions << Version.generate!
                   @source_project.versions << Version.generate!
                   assert @project.versions.empty?
                   assert @project.copy(@source_project)
                   assert_equal @source_project.versions.size, @project.versions.size
                   @project.versions.each do |version|
                     assert version
                     assert_equal @project, version.project
                   end
                 end
                 should "copy wiki" do
                   assert @project.copy(@source_project)
                   assert @project.wiki
                   assert_not_equal @source_project.wiki, @project.wiki
                   assert_equal "Start page", @project.wiki.start_page
                 end
                 should "copy wiki pages and content" do
                   assert @project.copy(@source_project)
                   assert @project.wiki
                   assert_equal 1, @project.wiki.pages.length
                   @project.wiki.pages.each do |wiki_page|
                     assert wiki_page.content
                     assert !@source_project.wiki.pages.include?(wiki_page)
                   end
                 end
                 should "copy custom fields"
                 should "copy issue categories" do
                   assert @project.copy(@source_project)
                   assert_equal 2, @project.issue_categories.size
                   @project.issue_categories.each do |issue_category|
                     assert !@source_project.issue_categories.include?(issue_category)
                   end
                 end
                 should "change the new issues to use the copied issue categories" do
                   issue = Issue.find(4)
                   issue.update_attribute(:category_id, 3)
                   assert @project.copy(@source_project)
                   @project.issues.each do |issue|
                     assert issue.category
                     assert_equal "Stock management", issue.category.name # Same name
                     assert_not_equal IssueCategory.find(3), issue.category # Different record
                   end
                 end
                 should "copy issue relations"
                 should "link issue relations if cross project issue relations are valid"
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages