From 04eefdc809b0a85ac83e6fe57f6153eeac333da1 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Thu, 12 Jan 2017 23:09:18 +0000 Subject: [PATCH] Adds settings to make the issue and/or comment fields mandatory for time logs (#24577). Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@16176 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/settings_helper.rb | 1 + app/models/time_entry.rb | 2 ++ app/views/settings/_timelog.html.erb | 10 ++++++++++ app/views/timelog/_form.html.erb | 4 ++-- config/locales/en.yml | 1 + config/locales/fr.yml | 1 + config/settings.yml | 3 +++ test/unit/time_entry_test.rb | 9 +++++++++ 8 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 app/views/settings/_timelog.html.erb diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 1bba0f9fa..3736715ba 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -25,6 +25,7 @@ module SettingsHelper {:name => 'api', :partial => 'settings/api', :label => :label_api}, {:name => 'projects', :partial => 'settings/projects', :label => :label_project_plural}, {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking}, + {:name => 'timelog', :partial => 'settings/timelog', :label => :label_time_tracking}, {:name => 'attachments', :partial => 'settings/attachments', :label => :label_attachment_plural}, {:name => 'notifications', :partial => 'settings/notifications', :label => :field_mail_notification}, {:name => 'mail_handler', :partial => 'settings/mail_handler', :label => :label_incoming_emails}, diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb index 431c1a554..09fcfa8a0 100644 --- a/app/models/time_entry.rb +++ b/app/models/time_entry.rb @@ -38,6 +38,8 @@ class TimeEntry < ActiveRecord::Base :scope => joins(:project).preload(:project) validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on + validates_presence_of :issue_id, :if => lambda { Setting.timelog_required_fields.include?('issue_id') } + validates_presence_of :comments, :if => lambda { Setting.timelog_required_fields.include?('comments') } validates_numericality_of :hours, :allow_nil => true, :message => :invalid validates_length_of :comments, :maximum => 1024, :allow_nil => true validates :spent_on, :date => true diff --git a/app/views/settings/_timelog.html.erb b/app/views/settings/_timelog.html.erb new file mode 100644 index 000000000..4f922011b --- /dev/null +++ b/app/views/settings/_timelog.html.erb @@ -0,0 +1,10 @@ +<%= form_tag({:action => 'edit', :tab => 'timelog'}) do %> + +
+

<%= setting_multiselect(:timelog_required_fields, + [[l(:field_issue), 'issue_id'], [l(:field_comments), 'comments'] ]) %>

+ +
+ +<%= submit_tag l(:button_save) %> +<% end %> diff --git a/app/views/timelog/_form.html.erb b/app/views/timelog/_form.html.erb index 712c7bde7..2d1134c4c 100644 --- a/app/views/timelog/_form.html.erb +++ b/app/views/timelog/_form.html.erb @@ -12,14 +12,14 @@ <% end %> <% end %>

- <%= f.text_field :issue_id, :size => 6 %> + <%= f.text_field :issue_id, :size => 6, :required => Setting.timelog_required_fields.include?('issue_id') %> <%= link_to_issue(@time_entry.issue) if @time_entry.issue.try(:visible?) %>

<%= f.date_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %>

<%= f.hours_field :hours, :size => 6, :required => true %>

-

<%= f.text_field :comments, :size => 100, :maxlength => 1024 %>

+

<%= f.text_field :comments, :size => 100, :maxlength => 1024, :required => Setting.timelog_required_fields.include?('comments') %>

<%= f.select :activity_id, activity_collection_for_select_options(@time_entry), :required => true %>

<% @time_entry.custom_field_values.each do |value| %>

<%= custom_field_tag_with_label :time_entry, value %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index deece3a17..d6201b9c7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -454,6 +454,7 @@ en: setting_attachment_extensions_denied: Disallowed extensions setting_new_item_menu_tab: Project menu tab for creating new objects setting_commit_logs_formatting: Apply text formatting to commit messages + setting_timelog_required_fields: Required fields for time logs permission_add_project: Create project permission_add_subprojects: Create subprojects diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 3996eccac..555dd6e01 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -466,6 +466,7 @@ fr: setting_lost_password: Autoriser la réinitialisation par email de mot de passe perdu setting_new_item_menu_tab: Onglet de création d'objets dans le menu du project setting_commit_logs_formatting: Appliquer le formattage de texte aux messages de commit + setting_timelog_required_fields: Champs obligatoire pour les temps passés permission_add_project: Créer un projet permission_add_subprojects: Créer des sous-projets diff --git a/config/settings.yml b/config/settings.yml index 1411a0143..c44da3259 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -283,3 +283,6 @@ non_working_week_days: - '7' new_item_menu_tab: default: 2 +timelog_required_fields: + serialized: true + default: [] diff --git a/test/unit/time_entry_test.rb b/test/unit/time_entry_test.rb index b86b1c53a..78f7f5e10 100644 --- a/test/unit/time_entry_test.rb +++ b/test/unit/time_entry_test.rb @@ -172,4 +172,13 @@ class TimeEntryTest < ActiveSupport::TestCase :activity => activity) assert_equal project.id, te.project.id end + + def test_create_with_required_issue_id_and_comment_should_be_validated + with_settings :timelog_required_fields => ['issue_id' , 'comments'] do + entry = TimeEntry.new(:project => Project.find(1), :spent_on => Date.today, :user => User.find(1), :activity => TimeEntryActivity.first, :hours => 1) + + assert !entry.save + assert_equal ["Comment cannot be blank", "Issue cannot be blank"], entry.errors.full_messages.sort + end + end end -- 2.39.5