0001-patch.diff - Redmine

       acts_as_activity_provider :find_options => {:include => [:project, :author, :tracker]},
                                 :author_key => :author_id
       DONE_RATIO_OPTIONS = %w(issue_field issue_status)
       DONE_RATIO_OPTIONS = %w(issue_field issue_status logged_time)
       attr_reader :current_journal
-...
                                       :conditions => ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"]
       before_create :default_assign
       before_save :close_duplicates, :update_done_ratio_from_issue_status
       before_save :close_duplicates, :update_done_ratio
       after_save {|issue| issue.send :after_project_change if !issue.id_changed? && issue.project_id_changed?}
       after_save :reschedule_following_issues, :update_nested_set_attributes, :update_parent_attributes, :create_journal
       after_destroy :update_parent_attributes
-...
       end
       def done_ratio
         if Issue.use_status_for_done_ratio? && status && status.default_done_ratio
         if use_status_for_done_ratio?
           status.default_done_ratio
         elsif use_time_for_done_ratio?
           if estimated_hours && estimated_hours.to_f > 0
             ratio = (total_spent_hours.to_f / estimated_hours.to_f) * 100
             [ratio, 100].min.to_i
           else
 .0
           end
         else
           read_attribute(:done_ratio)
         end
-...
       def self.use_status_for_done_ratio?
         Setting.issue_done_ratio == 'issue_status'
       end
       def use_status_for_done_ratio?
         Issue.use_status_for_done_ratio? && status && status.default_done_ratio
       end
       def self.use_time_for_done_ratio?
         Setting.issue_done_ratio == 'logged_time'
       end
       def use_time_for_done_ratio?
         Issue.use_time_for_done_ratio?
       end
       def self.use_field_for_done_ratio?
         Setting.issue_done_ratio == 'issue_field'
       end
       def use_field_for_done_ratio?
         !(use_status_for_done_ratio? || use_time_for_done_ratio?)
       end
       def validate_issue
         if self.due_date.nil? && @attributes['due_date'] && !@attributes['due_date'].empty?
-...
       # Set the done_ratio using the status if that setting is set.  This will keep the done_ratios
       # even if the user turns off the setting later
       def update_done_ratio_from_issue_status
         if Issue.use_status_for_done_ratio? && status && status.default_done_ratio
           self.done_ratio = status.default_done_ratio
       def update_done_ratio
         unless use_field_for_done_ratio?
           self.done_ratio = self.done_ratio
         end
       end
       def update_done_ratio!
         self.init_journal(User.current, "")
         self.update_done_ratio
         self.save
       end
       def init_journal(user, notes = "")
         @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
         if new_record?
-...
           end
           # done ratio = weighted average ratio of leaves
           unless Issue.use_status_for_done_ratio? && p.status && p.status.default_done_ratio
           if p.use_field_for_done_ratio
             leaves_count = p.leaves.count
             if leaves_count > 0
               average = p.leaves.average(:estimated_hours).to_f

       validates_numericality_of :hours, :allow_nil => true, :message => :invalid
       validates_length_of :comments, :maximum => 255, :allow_nil => true
       before_validation :set_project_if_nil
       after_save :update_done_ratio
       after_destroy :update_done_ratio
       validate :validate_time_entry
       named_scope :visible, lambda {|*args| {
-...
         errors.add :issue_id, :invalid if (issue_id && !issue) || (issue && project!=issue.project)
       end
       def update_done_ratio
         if issue && Issue.use_time_for_done_ratio?
           issue.update_done_ratio!
         end
       end
       def hours=(h)
         write_attribute :hours, (h.is_a?(String) ? (h.to_hours || h) : h)
       end

config/locales/ar.yml
1068	1068	field_author_role: Author's role
1069	1069	button_mail_link: Send by e-mail
1070	1070	label_add_to_all_workflows: Add to all workflows
	1071	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/bg.yml
1065	1065	field_author_role: Author's role
1066	1066	button_mail_link: Send by e-mail
1067	1067	label_add_to_all_workflows: Add to all workflows
	1068	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/bs.yml
1082	1082	field_author_role: Author's role
1083	1083	button_mail_link: Send by e-mail
1084	1084	label_add_to_all_workflows: Add to all workflows
	1085	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/ca.yml
1070	1070	field_author_role: Author's role
1071	1071	button_mail_link: Send by e-mail
1072	1072	label_add_to_all_workflows: Add to all workflows
	1073	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/cs.yml
1071	1071	field_author_role: Author's role
1072	1072	button_mail_link: Send by e-mail
1073	1073	label_add_to_all_workflows: Add to all workflows
	1074	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/da.yml
1085	1085	field_author_role: Author's role
1086	1086	button_mail_link: Send by e-mail
1087	1087	label_add_to_all_workflows: Add to all workflows
	1088	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/de.yml
1082	1082	label_required: Required
1083	1083	label_attribute_of_project: Project's %{name}
1084	1084	label_status_transitions: Status transitions
	1085	setting_issue_done_ratio_logged_time: Geschätzter und gebuchter Zeit

config/locales/el.yml
1068	1068	field_author_role: Author's role
1069	1069	button_mail_link: Send by e-mail
1070	1070	label_add_to_all_workflows: Add to all workflows
	1071	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/en-GB.yml
1070	1070	label_attribute_of_project: Project's %{name}
1071	1071	label_status_transitions: Status transitions
1072	1072	button_mail_link: Send by e-mail
	1073	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/en.yml
385	385	setting_issue_done_ratio: Calculate the issue done ratio with
386	386	setting_issue_done_ratio_issue_field: Use the issue field
387	387	setting_issue_done_ratio_issue_status: Use the issue status
	388	setting_issue_done_ratio_logged_time: Use the logged and estimated time
388	389	setting_start_of_week: Start calendars on
389	390	setting_rest_api_enabled: Enable REST web service
390	391	setting_cache_formatted_text: Cache formatted text

config/locales/es.yml
1105	1105	field_author_role: Author's role
1106	1106	button_mail_link: Send by e-mail
1107	1107	label_add_to_all_workflows: Add to all workflows
	1108	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/et.yml
1084	1084	field_author_role: Author's role
1085	1085	button_mail_link: Send by e-mail
1086	1086	label_add_to_all_workflows: Add to all workflows
	1087	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/eu.yml
1071	1071	field_author_role: Author's role
1072	1072	button_mail_link: Send by e-mail
1073	1073	label_add_to_all_workflows: Add to all workflows
	1074	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/fa.yml
1070	1070	field_author_role: Author's role
1071	1071	button_mail_link: Send by e-mail
1072	1072	label_add_to_all_workflows: Add to all workflows
	1073	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/fi.yml
1089	1089	field_author_role: Author's role
1090	1090	button_mail_link: Send by e-mail
1091	1091	label_add_to_all_workflows: Add to all workflows
	1092	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/fr.yml
1081	1081	field_author_role: Author's role
1082	1082	button_mail_link: Send by e-mail
1083	1083	label_add_to_all_workflows: Add to all workflows
	1084	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/gl.yml
1079	1079	field_author_role: Author's role
1080	1080	button_mail_link: Send by e-mail
1081	1081	label_add_to_all_workflows: Add to all workflows
	1082	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/he.yml
1073	1073	field_author_role: Author's role
1074	1074	button_mail_link: Send by e-mail
1075	1075	label_add_to_all_workflows: Add to all workflows
	1076	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/hr.yml
1071	1071	field_author_role: Author's role
1072	1072	button_mail_link: Send by e-mail
1073	1073	label_add_to_all_workflows: Add to all workflows
	1074	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/hu.yml
1087	1087	field_author_role: Author's role
1088	1088	button_mail_link: Send by e-mail
1089	1089	label_add_to_all_workflows: Add to all workflows
	1090	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/id.yml
1074	1074	field_author_role: Author's role
1075	1075	button_mail_link: Send by e-mail
1076	1076	label_add_to_all_workflows: Add to all workflows
	1077	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/it.yml
1069	1069	field_author_role: Author's role
1070	1070	button_mail_link: Send by e-mail
1071	1071	label_add_to_all_workflows: Add to all workflows
	1072	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/ja.yml
1098	1098	field_author_role: Author's role
1099	1099	button_mail_link: Send by e-mail
1100	1100	label_add_to_all_workflows: Add to all workflows
	1101	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/ko.yml
1118	1118	field_author_role: Author's role
1119	1119	button_mail_link: Send by e-mail
1120	1120	label_add_to_all_workflows: Add to all workflows
	1121	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/lt.yml
1128	1128	field_author_role: Author's role
1129	1129	button_mail_link: Send by e-mail
1130	1130	label_add_to_all_workflows: Add to all workflows
	1131	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/lv.yml
1062	1062	field_author_role: Author's role
1063	1063	button_mail_link: Send by e-mail
1064	1064	label_add_to_all_workflows: Add to all workflows
	1065	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/mk.yml
1068	1068	field_author_role: Author's role
1069	1069	button_mail_link: Send by e-mail
1070	1070	label_add_to_all_workflows: Add to all workflows
	1071	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/mn.yml
1068	1068	field_author_role: Author's role
1069	1069	button_mail_link: Send by e-mail
1070	1070	label_add_to_all_workflows: Add to all workflows
	1071	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/nl.yml
1053	1053	field_author_role: Author's role
1054	1054	button_mail_link: Send by e-mail
1055	1055	label_add_to_all_workflows: Add to all workflows
	1056	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/no.yml
1059	1059	field_author_role: Author's role
1060	1060	button_mail_link: Send by e-mail
1061	1061	label_add_to_all_workflows: Add to all workflows
	1062	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/pl.yml
1085	1085	field_author_role: Author's role
1086	1086	button_mail_link: Send by e-mail
1087	1087	label_add_to_all_workflows: Add to all workflows
	1088	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/pt-BR.yml
1090	1090	field_author_role: Author's role
1091	1091	button_mail_link: Send by e-mail
1092	1092	label_add_to_all_workflows: Add to all workflows
	1093	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/pt.yml
1073	1073	field_author_role: Author's role
1074	1074	button_mail_link: Send by e-mail
1075	1075	label_add_to_all_workflows: Add to all workflows
	1076	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/ro.yml
1065	1065	field_author_role: Author's role
1066	1066	button_mail_link: Send by e-mail
1067	1067	label_add_to_all_workflows: Add to all workflows
	1068	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/ru.yml
1181	1181	field_author_role: Author's role
1182	1182	button_mail_link: Send by e-mail
1183	1183	label_add_to_all_workflows: Add to all workflows
	1184	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/sk.yml
1068	1068	field_author_role: Author's role
1069	1069	button_mail_link: Send by e-mail
1070	1070	label_add_to_all_workflows: Add to all workflows
	1071	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/sl.yml
1068	1068	field_author_role: Author's role
1069	1069	button_mail_link: Send by e-mail
1070	1070	label_add_to_all_workflows: Add to all workflows
	1071	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/sq.yml
1072	1072	field_author_role: Author's role
1073	1073	button_mail_link: Send by e-mail
1074	1074	label_add_to_all_workflows: Add to all workflows
	1075	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/sr-YU.yml
1068	1068	field_author_role: Author's role
1069	1069	button_mail_link: Send by e-mail
1070	1070	label_add_to_all_workflows: Add to all workflows
	1071	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/sr.yml
1069	1069	field_author_role: Author's role
1070	1070	button_mail_link: Send by e-mail
1071	1071	label_add_to_all_workflows: Add to all workflows
	1072	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/sv.yml
1106	1106	field_author_role: Author's role
1107	1107	button_mail_link: Send by e-mail
1108	1108	label_add_to_all_workflows: Add to all workflows
	1109	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/th.yml
1065	1065	field_author_role: Author's role
1066	1066	button_mail_link: Send by e-mail
1067	1067	label_add_to_all_workflows: Add to all workflows
	1068	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/tr.yml
1087	1087	field_author_role: Author's role
1088	1088	button_mail_link: Send by e-mail
1089	1089	label_add_to_all_workflows: Add to all workflows
	1090	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/uk.yml
1063	1063	field_author_role: Author's role
1064	1064	button_mail_link: Send by e-mail
1065	1065	label_add_to_all_workflows: Add to all workflows
	1066	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/vi.yml
1119	1119	field_author_role: Author's role
1120	1120	button_mail_link: Send by e-mail
1121	1121	label_add_to_all_workflows: Add to all workflows
	1122	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/zh-TW.yml
1148	1148	field_author_role: Author's role
1149	1149	button_mail_link: Send by e-mail
1150	1150	label_add_to_all_workflows: Add to all workflows
	1151	setting_issue_done_ratio_logged_time: Use the logged and estimated time

config/locales/zh.yml
1070	1070	field_author_role: Author's role
1071	1071	button_mail_link: Send by e-mail
1072	1072	label_add_to_all_workflows: Add to all workflows
	1073	setting_issue_done_ratio_logged_time: Use the logged and estimated time

         end
       end
       context "#update_done_ratio_from_issue_status" do
       context "#update_done_ratio" do
         setup do
           @issue = Issue.find(1)
           @issue_status = IssueStatus.find(1)
-...
           end
           should "not change the issue" do
             @issue.update_done_ratio_from_issue_status
             @issue2.update_done_ratio_from_issue_status
             @issue.update_done_ratio
             @issue2.update_done_ratio
             assert_equal 0, @issue.read_attribute(:done_ratio)
             assert_equal 30, @issue2.read_attribute(:done_ratio)
-...
           end
           should "change the issue's done ratio" do
             @issue.update_done_ratio_from_issue_status
             @issue2.update_done_ratio_from_issue_status
             @issue.update_done_ratio
             @issue2.update_done_ratio
             assert_equal 50, @issue.read_attribute(:done_ratio)
             assert_equal 0, @issue2.read_attribute(:done_ratio)

Project

General

Profile

Redmine

Patch #13400 » 0001-patch.diff