0001-Option-to-set-default-time-entry-activity-per-role.patch - Redmine

       def activity_collection_for_select_options(time_entry=nil, project=nil)
         project ||= time_entry.try(:project)
         project ||= @project
         if project.nil?
           activities = TimeEntryActivity.shared.active
         else
           activities = project.activities
         end
         activities = TimeEntryActivity.allowed_activities(project)
         collection = []
         if time_entry && time_entry.activity && !time_entry.activity.active?
-...
         collection
       end
       def default_activity(time_entry)
         if @project
           time_entry.activity_id
         else
           TimeEntryActivity.default_activity_id(User.current, time_entry.project)
         end
       end
       def select_hours(data, criteria, value)
         if value.to_s.empty?
           data.select {|row| row[criteria].blank? }

         where("#{compare} builtin = 0")
+      }
       belongs_to :default_time_entry_activity, :class_name => "TimeEntryActivity"
       before_destroy :check_deletable
       has_many :workflow_rules, :dependent => :delete_all
       has_and_belongs_to_many :custom_fields, :join_table => "#{table_name_prefix}custom_fields_roles#{table_name_suffix}", :foreign_key => "role_id"
-...
           'managed_role_ids',
           'permissions',
           'permissions_all_trackers',
           'permissions_tracker_ids'
           'permissions_tracker_ids',
           'default_time_entry_activity_id'
       # Copies attributes from another role, arg can be an id or a Role
       def copy_from(arg, options={})

       def initialize(attributes=nil, *args)
         super
         if new_record? && self.activity.nil?
           if default_activity = TimeEntryActivity.default
             self.activity_id = default_activity.id
           end
           self.activity_id = TimeEntryActivity.default_activity_id(self.user, self.project)
           self.hours = nil if hours == 0
         end
       end

       def transfer_relations(to)
         objects.update_all(:activity_id => to.id)
       end
       def self.default_activity_id(user=nil, project=nil)
         default_activities = []
         default_activity = nil
         allowed_activities = self.allowed_activities(project)
         if project && user
           user_membership = user.membership(project)
           if user_membership
             default_activities = user_membership.roles.where.not(:default_time_entry_activity_id => nil).sort.pluck(:default_time_entry_activity_id)
           end
         end
         global_activity = self.default
         if global_activity
           default_activities << global_activity.id unless default_activities.include?(global_activity.id)
         end
         default_activities.each do |id|
           default_activity = allowed_activities.detect{ |a| a.id == id || a.parent_id == id }
           break unless default_activity.nil?
         end
         default_activity.id unless default_activity.nil?
       end
       # Returns the available activities for the time entry
       def self.allowed_activities(project=nil)
         if project.nil?
           activities = TimeEntryActivity.shared.active
         else
           activities = project.activities
         end
       end
     end

           <%= hidden_field_tag 'role[managed_role_ids][]', '' %>
       <% end %>
       <% unless @role.anonymous? %>
         <p><%= f.select :default_time_entry_activity_id, options_from_collection_for_select(TimeEntryActivity.active.shared, :id, :name, @role.default_time_entry_activity_id), :include_blank => l(:label_none) %></p>
       <% end %>
       <% if @role.new_record? && @roles.any? %>
         <p><label for="copy_workflow_from"><%= l(:label_copy_workflow_from) %></label>
         <%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@roles, :id, :name, params[:copy_workflow_from] || @copy_from.try(:id))) %></p>

app/views/timelog/new.js.erb

1

$('#time_entry_activity_id').html('<%= escape_javascript options_for_select(activity_collection_for_select_options(@time_entry), @time_entry.activity_id) %>');

1

$('#time_entry_activity_id').html('<%= escape_javascript options_for_select(activity_collection_for_select_options(@time_entry), default_activity(@time_entry)) %>');

2

$('#time_entry_issue').html('<%= escape_javascript link_to_issue(@time_entry.issue) if @time_entry.issue.try(:visible?) %>');

db/migrate/20180806215628_add_default_time_entry_activity_to_roles.rb
	1	class AddDefaultTimeEntryActivityToRoles < ActiveRecord::Migration[5.2]
	2	def change
	3	add_column :roles, :default_time_entry_activity_id, :int
	4	end
	5	end

         assert_response 403
       end
       def test_new_should_select_default_activity
       def test_new_should_select_default_role_activity
         developer = Role.find(2)
         developer.default_time_entry_activity_id = 9
         developer.save!
         @request.session[:user_id] = 3
         get :new, :params => {:project_id => 1}
         assert_response :success
         assert_select 'select[name=?]', 'time_entry[activity_id]' do
           assert_select 'option[selected=selected]', :text => 'Design'
         end
       end
       def test_new_should_select_default_global_activity_for_user_roles_without_default_activities
         @request.session[:user_id] = 3
         get :new, :params => {:project_id => 1}
         assert_response :success

         assert_include activity, project.activities
         assert_include TimeEntryActivity.find(9), project.activities
       end
       def test_default_activity_id_without_user_and_project_should_return_global_default_activity
         assert_equal 10, TimeEntryActivity.default_activity_id
       end
       def test_default_activity_id_with_user_and_project_should_return_role_default_activity
         # set a default activity for Manager role
         manager = Role.find(1)
         manager.default_time_entry_activity_id = 9
         manager.save
         assert_equal 9, TimeEntryActivity.default_activity_id(User.find(2), Project.find(1))
       end
       def test_default_activity_id_with_user_and_project_should_consider_role_position
         project = Project.find(1)
         user = User.find(2)
         # set a default activity for Manager role
         manager = Role.find(1)
         manager.default_time_entry_activity_id = 9
         manager.save!
         # set a default activity for Developer role
         # and set the role position first
         developer = Role.find(2)
         developer.default_time_entry_activity_id = 11
         developer.position = 1
         developer.save!
         member = Member.find_or_new(project, user)
         member.role_ids = [1, 2]
         member.save!
         assert_equal 11, TimeEntryActivity.default_activity_id(user, project)
       end
       def test_default_activity_id_should_include_only_allowed_activities
         # set a default activity for Manager role
         manager = Role.find(1)
         manager.default_time_entry_activity_id = 9
         manager.save!
         project = Project.find(1)
         # disable role default activity
         disable_activity = TimeEntryActivity.new({:name => "QA", :project => project, :parent => TimeEntryActivity.find(9), :active => false})
         disable_activity.save!
         assert_equal 10, TimeEntryActivity.default_activity_id(User.find(2), project)
       end
     end

Project

General

Profile

Redmine

Feature #29286 » 0001-Option-to-set-default-time-entry-activity-per-role.patch