Merge branch 'seeddms-5.0.x' into develop

This commit is contained in:
Uwe Steinmann 2016-03-18 16:40:46 +01:00
commit 601f32fc00

View File

@ -33,6 +33,7 @@ class SeedDMS_View_AddDocument extends SeedDMS_Bootstrap_Style {
function js() { /* {{{ */
$libraryfolder = $this->params['libraryfolder'];
$dropfolderdir = $this->params['dropfolderdir'];
header('Content-Type: application/javascript; charset=UTF-8');
?>
function checkForm()
@ -77,8 +78,10 @@ $(document).ready(function() {
<?php
$this->printKeywordChooserJs("form1");
$this->printDropFolderChooserJs("form1");
if($libraryfolder) {
if($libraryfolder)
$this->printDocumentChooserJs("form1");
if($dropfolderdir) {
$this->printDropFolderChooserJs("form1");
}
} /* }}} */