From b977d7c7fd692c392a6065f4b7af610059d39a9f Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 28 Aug 2020 11:54:52 +0200
Subject: [PATCH] no need to call printFolderChooserJs() anymore

---
 views/bootstrap/class.BackupTools.php  |  6 +++---
 views/bootstrap/class.ImportFS.php     |  2 +-
 views/bootstrap/class.ManageNotify.php |  4 ++--
 views/bootstrap/class.MoveDocument.php |  2 +-
 views/bootstrap/class.MoveFolder.php   |  2 +-
 views/bootstrap/class.Search.php       |  2 +-
 views/bootstrap/class.SearchForm.php   |  2 +-
 views/bootstrap/class.Settings.php     | 22 ++++------------------
 8 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/views/bootstrap/class.BackupTools.php b/views/bootstrap/class.BackupTools.php
index 9fa8c6beb..d2567ba58 100644
--- a/views/bootstrap/class.BackupTools.php
+++ b/views/bootstrap/class.BackupTools.php
@@ -34,9 +34,9 @@ class SeedDMS_View_BackupTools extends SeedDMS_Bootstrap_Style {
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript');
 
-		$this->printFolderChooserJs("form1");
-		$this->printFolderChooserJs("form2");
-		$this->printFolderChooserJs("form3");
+//		$this->printFolderChooserJs("form1");
+//		$this->printFolderChooserJs("form2");
+//		$this->printFolderChooserJs("form3");
 	} /* }}} */
 
 	function show() { /* {{{ */
diff --git a/views/bootstrap/class.ImportFS.php b/views/bootstrap/class.ImportFS.php
index 36387e615..e6d500f68 100644
--- a/views/bootstrap/class.ImportFS.php
+++ b/views/bootstrap/class.ImportFS.php
@@ -34,7 +34,7 @@ class SeedDMS_View_ImportFS extends SeedDMS_Bootstrap_Style {
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript');
 
-		$this->printFolderChooserJs("form1");
+//		$this->printFolderChooserJs("form1");
 		$this->printDropFolderChooserJs("form1", 1);
 	} /* }}} */
 
diff --git a/views/bootstrap/class.ManageNotify.php b/views/bootstrap/class.ManageNotify.php
index 08f142754..236570370 100644
--- a/views/bootstrap/class.ManageNotify.php
+++ b/views/bootstrap/class.ManageNotify.php
@@ -133,8 +133,8 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript');
 
-		$this->printFolderChooserJs("form1");
-		$this->printDocumentChooserJs("form2");
+//		$this->printFolderChooserJs("form1");
+//		$this->printDocumentChooserJs("form2");
 		$this->printClickDocumentJs();
 		$this->printClickFolderJs();
 	} /* }}} */
diff --git a/views/bootstrap/class.MoveDocument.php b/views/bootstrap/class.MoveDocument.php
index 286428e6f..8862db301 100644
--- a/views/bootstrap/class.MoveDocument.php
+++ b/views/bootstrap/class.MoveDocument.php
@@ -34,7 +34,7 @@ class SeedDMS_View_MoveDocument extends SeedDMS_Bootstrap_Style {
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript');
 
-		$this->printFolderChooserJs("form1");
+//		$this->printFolderChooserJs("form1");
 	} /* }}} */
 
 	function show() { /* {{{ */
diff --git a/views/bootstrap/class.MoveFolder.php b/views/bootstrap/class.MoveFolder.php
index fc741e40a..f9091fe31 100644
--- a/views/bootstrap/class.MoveFolder.php
+++ b/views/bootstrap/class.MoveFolder.php
@@ -34,7 +34,7 @@ class SeedDMS_View_MoveFolder extends SeedDMS_Bootstrap_Style {
 	function js() { /* {{{ */
 		header('Content-Type: application/javascript');
 
-		$this->printFolderChooserJs("form1");
+//		$this->printFolderChooserJs("form1");
 	} /* }}} */
 
 	function show() { /* {{{ */
diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 920cea858..4e91d4301 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -57,7 +57,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 
 		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder'));
 
-		$this->printFolderChooserJs("form1");
+//		$this->printFolderChooserJs("form1");
 		$this->printDeleteFolderButtonJs();
 		$this->printDeleteDocumentButtonJs();
 		/* Add js for catching click on document in one page mode */
diff --git a/views/bootstrap/class.SearchForm.php b/views/bootstrap/class.SearchForm.php
index 24ce015ee..1e89729f6 100644
--- a/views/bootstrap/class.SearchForm.php
+++ b/views/bootstrap/class.SearchForm.php
@@ -66,7 +66,7 @@ $(document).ready(function() {
 	});
 });
 <?php
-		$this->printFolderChooserJs("form1");
+//		$this->printFolderChooserJs("form1");
 	} /* }}} */
 
 	function show() { /* {{{ */
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 94b95f7ab..ea7c37582 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -236,23 +236,6 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style {
 			});
 		});
 <?php
-		foreach($extmgr->getExtensionConfiguration() as $extname=>$extconf) {
-			if($extconf['config']) {
-				foreach($extconf['config'] as $confkey=>$conf) {
-					switch($conf['type']) {
-					case 'select':
-						if(!empty($conf['internal'])) {
-							switch($conf['internal']) {
-							case "folders":
-								$this->printFolderChooserJs("form".$extname.$confkey, 'extensions['.$extname."][".$confkey."]");
-								break;
-							}
-						}
-						break;
-					}
-				}
-			}
-		}
 	} /* }}} */
 
 	function show() { /* {{{ */
@@ -587,7 +570,10 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
 										}
 										break;
 									case "attributedefinitions":
-										$recs = $dms->getAllAttributeDefinitions();
+										if(empty($conf['objtype']))
+											$recs = $dms->getAllAttributeDefinitions();
+										else
+											$recs = $dms->getAllAttributeDefinitions(explode(',', $conf['objtype']));
 										if($recs) {
 											echo "<select class=\"chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? "  multiple" : "").(!empty($conf['size']) ? "  size=\"".$conf['size']."\"" : "")." data-placeholder=\"".getMLText("select_attribute_value")."\">";
 											if($allowempty)