gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 15:14:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2024-05-02 08:27:47 +02:00
commit 14d79d58e7
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
views/bootstrap/class.AddDocument.php
View File

@ -174,6 +174,9 @@ console.log(params);
$orderby = $this->params['orderby']; $orderby = $this->params['orderby'];
$folderid = $folder->getId(); $folderid = $folder->getId();
$accessop = $this->params['accessobject']; $accessop = $this->params['accessobject'];
$accept = $this->getParam('accept');
if($accept && is_array($accept))
$accept = implode(',', $accept);
$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js'); $this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/additional-methods.js"></script>'."\n", 'js'); $this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/additional-methods.js"></script>'."\n", 'js');
@ -403,7 +406,7 @@ console.log(params);
} }
$this->formField( $this->formField(
getMLText("local_file"), getMLText("local_file"),
$enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile[]', $enablemultiupload).($enablemultiupload ? '<a class="" id="new-file"><?php printMLtext("add_multiple_files") ?></a>' : '') $enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile[]', $enablemultiupload, $accept).($enablemultiupload ? '<a class="" id="new-file"><?php printMLtext("add_multiple_files") ?></a>' : '')
); );
if($dropfolderdir) { if($dropfolderdir) {
$this->formField( $this->formField(

5
views/bootstrap/class.UpdateDocument.php
View File

@ -149,6 +149,9 @@ console.log(element);
$workflowmode = $this->params['workflowmode']; $workflowmode = $this->params['workflowmode'];
$presetexpiration = $this->params['presetexpiration']; $presetexpiration = $this->params['presetexpiration'];
$documentid = $document->getId(); $documentid = $document->getId();
$accept = $this->getParam('accept');
if($accept && is_array($accept))
$accept = implode(',', $accept);
$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js'); $this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/additional-methods.js"></script>'."\n", 'js'); $this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/additional-methods.js"></script>'."\n", 'js');
@ -216,7 +219,7 @@ console.log(element);
$this->contentContainerStart(); $this->contentContainerStart();
$this->formField( $this->formField(
getMLText("local_file"), getMLText("local_file"),
$enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile', false) $enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile', false, $accept)
); );
if($dropfolderdir) { if($dropfolderdir) {
$this->formField( $this->formField(