From b8fa5c4100dfa0372f6de70938c434efc9ceb915 Mon Sep 17 00:00:00 2001 From: Liane Hampe Date: Fri, 8 Jan 2021 10:40:50 +0100 Subject: [PATCH 1/4] Modify .gitignore Added .history to be ignored. It is a directory with local history used in Visual Studio Code IDE. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 4c723dd9..72bc63f2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /test/fixtures/files/** !/test/fixtures/files/2017/** Gemfile.lock +.history \ No newline at end of file From 7675d10a7ee39233817c9d6dec1c8ad88f69efc3 Mon Sep 17 00:00:00 2001 From: Liane Hampe Date: Thu, 21 Jan 2021 13:34:35 +0100 Subject: [PATCH 2/4] Fix typo in german translations --- config/locales/de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/de.yml b/config/locales/de.yml index a8d34df9..e4fdae60 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -318,7 +318,7 @@ de: label_links_only: nur Verknüpfungen label_display_notified_recipients: Zeige benachrichtigte Empfänger - note_display_notified_recipients: Der Benutzer wird darüber informiert, wer die Empfänger der E-mail-Benachrichtigungen sind. + note_display_notified_recipients: Der Benutzer wird darüber informiert, wer die Empfänger der E-Mail-Benachrichtigungen sind. warning_email_notifications: "E-Mailbenachrichtigung wurde gesendet an %{to}" link_trash_bin: Papierkorb From f4363f841ddf287c4a2a2fcf298e8337e5351a36 Mon Sep 17 00:00:00 2001 From: Liane Hampe Date: Fri, 19 Feb 2021 11:14:22 +0100 Subject: [PATCH 3/4] Highlight admin menu item of dmsf workflows --- app/controllers/dmsf_workflows_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/dmsf_workflows_controller.rb b/app/controllers/dmsf_workflows_controller.rb index 57f19d8c..f0ccb787 100644 --- a/app/controllers/dmsf_workflows_controller.rb +++ b/app/controllers/dmsf_workflows_controller.rb @@ -22,6 +22,7 @@ class DmsfWorkflowsController < ApplicationController model_object DmsfWorkflow + menu_item :dmsf_approvalworkflows before_action :find_model_object, except: [:create, :new, :index, :assign, :assignment] before_action :find_project From 3f16574dd302b462eff00e8891d4116a22f42482 Mon Sep 17 00:00:00 2001 From: Liane Hampe Date: Fri, 19 Feb 2021 11:15:14 +0100 Subject: [PATCH 4/4] Change ProjectPatch#copy The RedmineDmsf::Patches::ProjectPatch#copy method override misses to return a final false. This missing boolean of false cause a Redmine core test to fail. This little change fixes the failing core test: ProjectCopyTest#test_copy_should_return_false_if_save_fails. --- lib/redmine_dmsf/patches/project_patch.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/redmine_dmsf/patches/project_patch.rb b/lib/redmine_dmsf/patches/project_patch.rb index 6dc0195e..9ddf7714 100644 --- a/lib/redmine_dmsf/patches/project_patch.rb +++ b/lib/redmine_dmsf/patches/project_patch.rb @@ -39,6 +39,8 @@ module RedmineDmsf send "copy_#{name}", project end save + else + false end end