Dateimanagement: nicht implementierte Speichertypen nicht anbieten/entfernen

Aus Maske und Datenbank (defaults)

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index 87d676b..8f052b6 100644 (file)
--- 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 6f72113..093d907 100755 (executable)
--- 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 5b6d96a..cb36002 100644 (file)
--- 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 (file)
index 0000000..4d54119
--- /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 cf72e80..1b685bd 100644 (file)
--- a/templates/webpages/client_config/_features.html
+++ b/templates/webpages/client_config/_features.html
@@ -37,7 +37,7 @@
   <tr>
     <td align="right">[% LxERP.t8('Storage Type for generated/imported PDF Documents') %]</td>
     <td>[% 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);") %]</td>
     <td>[% LxERP.t8('Use this storage backend for all generated PDF-Files') %]</td>
@@ -45,7 +45,7 @@
   <tr>
     <td align="right">[% LxERP.t8('Storage Type for Attachments') %]</td>
     <td>[% 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);") %]</td>
     <td>[% LxERP.t8('Use this storage backend for all uploaded attachments') %]</td>
@@ -53,7 +53,7 @@
   <tr>
     <td align="right">[% LxERP.t8('Storage Type for images') %]</td>
     <td>[% 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);") %]</td>
     <td>[% LxERP.t8('Use this storage backend for uploaded images') %]</td>
@@ -61,7 +61,7 @@
   <tr>
     <td align="right">[% LxERP.t8('Storage Type for shopimages') %]</td>
     <td>[% 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);") %]</td>
     <td>[% LxERP.t8('Use this storage backend for uploaded images') %]</td>
@@ -88,11 +88,6 @@
    <td>[% L.yes_no_tag('defaults.doc_webdav', SELF.defaults.doc_webdav) %]</td>
    <td>[% LxERP.t8('Use WebDAV Storage backend') %]</td>
   </tr>
-  <tr>
-   <td align="right">[% LxERP.t8('Database') %]</td>
-   <td>[% L.yes_no_tag('defaults.doc_database', SELF.defaults.doc_database, disabled=1) %]</td>
-   <td>[% LxERP.t8('Use Database Storage backend (not implemented yet!)') %]</td>
-  </tr>
 
   <tr><td class="listheading" colspan="4">[% LxERP.t8("Reports") %]</td></tr>
 

diff --git a/templates/webpages/client_config/form.html b/templates/webpages/client_config/form.html
index 9913710..f0d2621 100644 (file)
--- 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';