From 58f3cd673739332ecf83187f22470d2affdf8f44 Mon Sep 17 00:00:00 2001 From: Rolf Schmidt Date: Mon, 21 Mar 2022 13:04:55 +0100 Subject: [PATCH] Fixes #4023 - Obsolete notice field in admin calendar view. --- app/assets/javascripts/app/models/calendar.coffee | 3 +-- i18n/zammad.pot | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/assets/javascripts/app/models/calendar.coffee b/app/assets/javascripts/app/models/calendar.coffee index c2b497c3e..129d5ea85 100644 --- a/app/assets/javascripts/app/models/calendar.coffee +++ b/app/assets/javascripts/app/models/calendar.coffee @@ -1,5 +1,5 @@ class App.Calendar extends App.Model - @configure 'Calendar', 'name', 'timezone', 'default', 'business_hours', 'ical_url', 'public_holidays', 'note' + @configure 'Calendar', 'name', 'timezone', 'default', 'business_hours', 'ical_url', 'public_holidays' @extend Spine.Model.Ajax @url: @apiPath + '/calendars' @@ -9,7 +9,6 @@ class App.Calendar extends App.Model { name: 'business_hours', display: __('Business Hours'), tag: 'business_hours', null: true } { name: 'ical_url', display: __('Holidays iCalendar Feed'), tag: 'ical_feed', placeholder: 'http://example.com/public_holidays.ical', null: true } { name: 'public_holidays',display: __('Holidays'), tag: 'holiday_selector', null: true } - { name: 'note', display: __('Note'), tag: 'textarea', limit: 250, null: true }, { name: 'created_by_id', display: __('Created by'), relation: 'User', readonly: 1 }, { name: 'created_at', display: __('Created'), tag: 'datetime', readonly: 1 }, { name: 'updated_by_id', display: __('Updated by'), relation: 'User', readonly: 1 }, diff --git a/i18n/zammad.pot b/i18n/zammad.pot index 1d666bbb3..5e257d3ae 100644 --- a/i18n/zammad.pot +++ b/i18n/zammad.pot @@ -6580,7 +6580,6 @@ msgid "Not configured" msgstr "" #: app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee -#: app/assets/javascripts/app/models/calendar.coffee #: app/assets/javascripts/app/models/chat.coffee #: app/assets/javascripts/app/models/email_address.coffee #: app/assets/javascripts/app/models/group.coffee