From: Bernd Bleßmann Date: Mon, 28 Dec 2020 16:49:34 +0000 (+0100) Subject: Revert "Zeiterfassung: SimpleSystemSettings für Typen" X-Git-Tag: kivitendo-mebil_0.1-0~9^2~324 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=05de5bf1797eae03f9f5708a8b115ed7ab873632;p=kivitendo-erp.git Revert "Zeiterfassung: SimpleSystemSettings für Typen" This reverts commit d01aad90ec0e0f0800037e9753acbacccf819a0c. Conflicts: menus/user/10-time-recording.yaml --- diff --git a/SL/Controller/SimpleSystemSetting.pm b/SL/Controller/SimpleSystemSetting.pm index 640414d47..f8dd4bc49 100644 --- a/SL/Controller/SimpleSystemSetting.pm +++ b/SL/Controller/SimpleSystemSetting.pm @@ -268,21 +268,6 @@ my %supported_types = ( ], }, - time_recording_type => { - # Make locales.pl happy: $self->render("simple_system_setting/_time_recording_type_form") - class => 'TimeRecordingType', - auth => 'config', - titles => { - list => t8('Time Recording Types'), - add => t8('Add time recording type'), - edit => t8('Edit time recording type'), - }, - list_attributes => [ - { method => 'abbreviation', title => t8('Abbreviation') }, - { method => 'description', title => t8('Description') }, - { method => 'obsolete', title => t8('Obsolete'), formatter => sub { $_[0]->obsolete ? t8('yes') : t8('no') } }, - ], - }, ); my @default_list_attributes = ( diff --git a/menus/user/10-time-recording.yaml b/menus/user/10-time-recording.yaml index 59817a021..dfa1d53ec 100644 --- a/menus/user/10-time-recording.yaml +++ b/menus/user/10-time-recording.yaml @@ -1,12 +1,4 @@ --- -- parent: system - id: system_time_recording_types - name: Time Recording Types - order: 2370 - access: config - params: - action: SimpleSystemSetting/list - type: time_recording_type - parent: productivity id: productivity_time_recording name: Time Recording diff --git a/templates/webpages/simple_system_setting/_time_recording_type_form.html b/templates/webpages/simple_system_setting/_time_recording_type_form.html deleted file mode 100644 index aa136f363..000000000 --- a/templates/webpages/simple_system_setting/_time_recording_type_form.html +++ /dev/null @@ -1,19 +0,0 @@ -[%- USE LxERP -%][%- USE L -%] - - - - - - - - - - - - - -
[% LxERP.t8("Abbreviation") %] - [%- L.input_tag("object.abbreviation", SELF.object.abbreviation, "data-validate"="required", "data-title"=LxERP.t8("Abbreviation")) %] -
[% LxERP.t8("Description") %] - [%- L.input_tag("object.description", SELF.object.description, "data-title"=LxERP.t8("Description")) %] -
[% LxERP.t8("Obsolete") %][% L.checkbox_tag("object.obsolete", checked=SELF.object.obsolete, for_submit=1) %]