From 3af1ae3c0e590feebb2f4c0f1fc0a5bd6dfbd4a2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= Date: Sat, 25 Aug 2018 13:40:54 +0200 Subject: [PATCH] Dateimanagement: nicht implementierte Speichertypen nicht anbieten/entfernen Aus Maske und Datenbank (defaults) --- SL/DB/MetaSetup/Default.pm | 1 - locale/de/all | 3 --- locale/en/all | 3 --- .../defaults_filemanagement_remove_doc_database.sql | 5 +++++ templates/webpages/client_config/_features.html | 13 ++++--------- templates/webpages/client_config/form.html | 4 ---- 6 files changed, 9 insertions(+), 20 deletions(-) create mode 100644 sql/Pg-upgrade2/defaults_filemanagement_remove_doc_database.sql diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm index 87d676b4f..8f052b67a 100644 --- a/SL/DB/MetaSetup/Default.pm +++ b/SL/DB/MetaSetup/Default.pm @@ -46,7 +46,6 @@ __PACKAGE__->meta->columns( datev_check_on_purchase_invoice => { type => 'boolean', default => 'true' }, datev_check_on_sales_invoice => { type => 'boolean', default => 'true' }, disabled_price_sources => { type => 'array' }, - doc_database => { type => 'boolean', default => 'false' }, doc_delete_printfiles => { type => 'boolean', default => 'false' }, doc_files => { type => 'boolean', default => 'false' }, doc_files_rootpath => { type => 'text', default => './documents' }, diff --git a/locale/de/all b/locale/de/all index 6f721134f..093d90781 100755 --- a/locale/de/all +++ b/locale/de/all @@ -855,7 +855,6 @@ $self->{texts} = { 'Data type' => 'Datentyp', 'DataSet #1' => 'Datensatz #1', 'DataSet for GoBD version #1. Created with kivitendo #2 by #3 (#4)' => 'Datenüberlassung nach GoBD vom #1. Erstellt mit kivitendo #2. Ansprechpartner ist #3 (#4)', - 'Database' => 'Datenbank', 'Database Administration' => 'Datenbankadministration', 'Database Connection Test' => 'Test der Datenbankverbindung', 'Database Host' => 'Datenbankcomputer', @@ -3678,7 +3677,6 @@ $self->{texts} = { 'UsageWithout' => 'Entnommen (ohne Korr.)', 'Use As New' => 'Als neu verwenden', 'Use Balance Sheet' => 'Bilanz verwenden', - 'Use Database Storage backend (not implemented yet!)' => 'Verwende Datenbank-Backend (NICHT IMPLEMENTIERT !)', 'Use Datevautomatik' => 'Datev-Automatik verwenden', 'Use Erfolgsrechnung' => 'Erfolgsrechnung verwenden', 'Use File Storage backend' => 'Verwende Dateisystem-Backend', @@ -3956,7 +3954,6 @@ $self->{texts} = { 'every time' => 'immer', 'executed' => 'ausgeführt', 'execution as user \'#1\'' => 'Ausführung als User »#1«', - 'ext.DMS' => 'externes DMS', 'failed' => 'fehlgeschlagen', 'false' => 'falsch', 'female' => 'weiblich', diff --git a/locale/en/all b/locale/en/all index 5b6d96a6c..cb36002c8 100644 --- a/locale/en/all +++ b/locale/en/all @@ -855,7 +855,6 @@ $self->{texts} = { 'Data type' => '', 'DataSet #1' => '', 'DataSet for GoBD version #1. Created with kivitendo #2 by #3 (#4)' => '', - 'Database' => '', 'Database Administration' => '', 'Database Connection Test' => '', 'Database Host' => '', @@ -3677,7 +3676,6 @@ $self->{texts} = { 'UsageWithout' => 'Usage (without correction)', 'Use As New' => '', 'Use Balance Sheet' => '', - 'Use Database Storage backend (not implemented yet!)' => '', 'Use Datevautomatik' => '', 'Use Erfolgsrechnung' => '', 'Use File Storage backend' => '', @@ -3955,7 +3953,6 @@ $self->{texts} = { 'every time' => '', 'executed' => '', 'execution as user \'#1\'' => '', - 'ext.DMS' => '', 'failed' => '', 'false' => '', 'female' => '', diff --git a/sql/Pg-upgrade2/defaults_filemanagement_remove_doc_database.sql b/sql/Pg-upgrade2/defaults_filemanagement_remove_doc_database.sql new file mode 100644 index 000000000..4d5411999 --- /dev/null +++ b/sql/Pg-upgrade2/defaults_filemanagement_remove_doc_database.sql @@ -0,0 +1,5 @@ +-- @tag: defaults_filemanagement_remove_doc_database +-- @description: "Unbenutze Spalte für Dateimanagement-Speichertyp Datenbank entfernen" +-- @depends: filemanagement_feature + +ALTER TABLE defaults DROP COLUMN doc_database; diff --git a/templates/webpages/client_config/_features.html b/templates/webpages/client_config/_features.html index cf72e8025..1b685bd3a 100644 --- a/templates/webpages/client_config/_features.html +++ b/templates/webpages/client_config/_features.html @@ -37,7 +37,7 @@ [% LxERP.t8('Storage Type for generated/imported PDF Documents') %] [% L.select_tag('defaults.doc_storage_for_documents', - [ [ 'None', LxERP.t8('None') ],[ 'Filesystem', LxERP.t8('Files') ],[ 'Webdav', LxERP.t8('WebDAV') ],[ 'ExtDMS', LxERP.t8('ext.DMS') ],[ 'DB', LxERP.t8('Database') ] ], + [ [ 'None', LxERP.t8('None') ],[ 'Filesystem', LxERP.t8('Files') ],[ 'Webdav', LxERP.t8('WebDAV') ] ], default = SELF.defaults.doc_storage_for_documents, onchange="return checkavailable_filebackend(this);") %] [% LxERP.t8('Use this storage backend for all generated PDF-Files') %] @@ -45,7 +45,7 @@ [% LxERP.t8('Storage Type for Attachments') %] [% L.select_tag('defaults.doc_storage_for_attachments', - [ [ 'None', LxERP.t8('None') ], [ 'Filesystem', LxERP.t8('Files') ],[ 'Webdav', LxERP.t8('WebDAV') ],[ 'ExtDMS', LxERP.t8('ext.DMS') ],[ 'DB', LxERP.t8('Database') ] ], + [ [ 'None', LxERP.t8('None') ], [ 'Filesystem', LxERP.t8('Files') ],[ 'Webdav', LxERP.t8('WebDAV') ] ], default = SELF.defaults.doc_storage_for_attachments, onchange="return checkavailable_filebackend(this);") %] [% LxERP.t8('Use this storage backend for all uploaded attachments') %] @@ -53,7 +53,7 @@ [% LxERP.t8('Storage Type for images') %] [% L.select_tag('defaults.doc_storage_for_images', - [ [ 'None', LxERP.t8('None') ], [ 'Filesystem', LxERP.t8('Files') ],[ 'Webdav', LxERP.t8('WebDAV') ],[ 'ExtDMS', LxERP.t8('ext.DMS') ],[ 'DB', LxERP.t8('Database') ] ], + [ [ 'None', LxERP.t8('None') ], [ 'Filesystem', LxERP.t8('Files') ],[ 'Webdav', LxERP.t8('WebDAV') ] ], default = SELF.defaults.doc_storage_for_images, onchange="return checkavailable_filebackend(this);") %] [% LxERP.t8('Use this storage backend for uploaded images') %] @@ -61,7 +61,7 @@ [% LxERP.t8('Storage Type for shopimages') %] [% L.select_tag('defaults.doc_storage_for_shopimages', - [ [ 'None', LxERP.t8('None') ], [ 'Filesystem', LxERP.t8('Files') ],[ 'Webdav', LxERP.t8('WebDAV') ],[ 'ExtDMS', LxERP.t8('ext.DMS') ],[ 'DB', LxERP.t8('Database') ] ], + [ [ 'None', LxERP.t8('None') ], [ 'Filesystem', LxERP.t8('Files') ],[ 'Webdav', LxERP.t8('WebDAV') ] ], default = SELF.defaults.doc_storage_for_shopimages, onchange="return checkavailable_filebackend(this);") %] [% LxERP.t8('Use this storage backend for uploaded images') %] @@ -88,11 +88,6 @@ [% L.yes_no_tag('defaults.doc_webdav', SELF.defaults.doc_webdav) %] [% LxERP.t8('Use WebDAV Storage backend') %] - - [% LxERP.t8('Database') %] - [% L.yes_no_tag('defaults.doc_database', SELF.defaults.doc_database, disabled=1) %] - [% LxERP.t8('Use Database Storage backend (not implemented yet!)') %] - [% LxERP.t8("Reports") %] diff --git a/templates/webpages/client_config/form.html b/templates/webpages/client_config/form.html index 9913710ec..f0d26214b 100644 --- a/templates/webpages/client_config/form.html +++ b/templates/webpages/client_config/form.html @@ -54,10 +54,6 @@ function checkavailable_filebackend(elem) { var selval = elem.value; if ( selval == 'Webdav' && $("#defaults_doc_webdav").val() == 0 ) { elem.value = 'Filesystem'; - } else if ( selval == 'ExtDMS' ) { - elem.value = 'Filesystem'; - } if ( selval == 'DB' && $("#defaults_doc_database").val() == 0 ) { - elem.value = 'Filesystem'; } if ( elem.value == 'Filesystem' && $("#defaults_doc_files").val() == 0 ) { elem.value = 'None'; -- 2.20.1