Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #4023 - Obsolete notice field in admin calendar view.

Browse source
This commit is contained in:
Rolf Schmidt 2022-03-21 13:04:55 +01:00
parent 76d8a83f0f
commit 58f3cd6737
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/app/models/calendar.coffee
View file

@ -1,5 +1,5 @@
class App.Calendar extends App.Model 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 @extend Spine.Model.Ajax
@url: @apiPath + '/calendars' @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: '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: '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: '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_by_id', display: __('Created by'), relation: 'User', readonly: 1 },
{ name: 'created_at', display: __('Created'), tag: 'datetime', readonly: 1 }, { name: 'created_at', display: __('Created'), tag: 'datetime', readonly: 1 },
{ name: 'updated_by_id', display: __('Updated by'), relation: 'User', readonly: 1 }, { name: 'updated_by_id', display: __('Updated by'), relation: 'User', readonly: 1 },

1
i18n/zammad.pot
View file

@ -6580,7 +6580,6 @@ msgid "Not configured"
msgstr "" msgstr ""
#: app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee #: 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/chat.coffee
#: app/assets/javascripts/app/models/email_address.coffee #: app/assets/javascripts/app/models/email_address.coffee
#: app/assets/javascripts/app/models/group.coffee #: app/assets/javascripts/app/models/group.coffee