From 2df8c9c7bfdb17e3c2ced5fb5805f0ad7152c90a Mon Sep 17 00:00:00 2001 From: Rolf Schmidt Date: Mon, 14 Mar 2022 10:58:20 +0100 Subject: [PATCH] Fixes #4009 - "Note - visibility confirmation dialog" setting also requests confirmation for e.g. email and phone articles. --- db/migrate/20220314080801_issue4009_fix_title.rb | 10 ++++++++++ db/seeds/settings.rb | 2 +- i18n/zammad.pot | 8 ++++---- 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 db/migrate/20220314080801_issue4009_fix_title.rb diff --git a/db/migrate/20220314080801_issue4009_fix_title.rb b/db/migrate/20220314080801_issue4009_fix_title.rb new file mode 100644 index 000000000..377f1aff4 --- /dev/null +++ b/db/migrate/20220314080801_issue4009_fix_title.rb @@ -0,0 +1,10 @@ +# Copyright (C) 2012-2022 Zammad Foundation, https://zammad-foundation.org/ + +class Issue4009FixTitle < ActiveRecord::Migration[6.0] + def change + # return if it's a new setup + return if !Setting.exists?(name: 'system_init_done') + + Setting.find_by(title: 'Note - visibility confirmation dialog').update(title: 'Article - visibility confirmation dialog') + end +end diff --git a/db/seeds/settings.rb b/db/seeds/settings.rb index f50339bc1..b5e5f65c7 100644 --- a/db/seeds/settings.rb +++ b/db/seeds/settings.rb @@ -704,7 +704,7 @@ Setting.create_if_not_exists( ) Setting.create_if_not_exists( - title: __('Note - visibility confirmation dialog'), + title: __('Article - visibility confirmation dialog'), name: 'ui_ticket_zoom_article_visibility_confirmation_dialog', area: 'UI::TicketZoom', description: __('Defines if the agent has to accept a confirmation dialog when changing the article visibility to "public".'), diff --git a/i18n/zammad.pot b/i18n/zammad.pot index 0c6af53fb..7ccd63ca6 100644 --- a/i18n/zammad.pot +++ b/i18n/zammad.pot @@ -861,6 +861,10 @@ msgstr "" msgid "Article" msgstr "" +#: db/seeds/settings.rb +msgid "Article - visibility confirmation dialog" +msgstr "" + #: lib/excel_sheet/ticket.rb msgid "Article Count" msgstr "" @@ -6598,10 +6602,6 @@ msgstr "" msgid "Note - default visibility" msgstr "" -#: db/seeds/settings.rb -msgid "Note - visibility confirmation dialog" -msgstr "" - #: app/assets/javascripts/app/models/email_address.coffee #: app/assets/javascripts/app/models/group.coffee #: app/assets/javascripts/app/models/job.coffee