change name of form from 'form1' to 'adddocform'

needed for hooks, to tell which form is currently shown
This commit is contained in:
Uwe Steinmann 2019-02-04 08:44:13 +01:00
parent 1db49ff214
commit 64e517a02e

View File

@ -76,7 +76,7 @@ $(document).ready(function() {
} }
return false; return false;
}, "<?php printMLText("js_no_file");?>"); }, "<?php printMLText("js_no_file");?>");
$("#form1").validate({ $("#adddocform").validate({
debug: false, debug: false,
ignore: ":hidden:not(.do_validate)", ignore: ":hidden:not(.do_validate)",
invalidHandler: function(e, validator) { invalidHandler: function(e, validator) {
@ -107,16 +107,16 @@ $(document).ready(function() {
if($enablelargefileupload) { if($enablelargefileupload) {
?> ?>
'userfile-fine-uploader-uuids': { 'userfile-fine-uploader-uuids': {
fineuploader: [ userfileuploader, $('#dropfolderfileform1') ] fineuploader: [ userfileuploader, $('#dropfolderfileadddocform') ]
} }
<?php <?php
} else { } else {
?> ?>
'userfile[]': { 'userfile[]': {
alternatives: [$('#dropfolderfileform1'), $('#choosedocsearchform1')] alternatives: [$('#dropfolderfileadddocform'), $('#choosedocsearchadddocform')]
}, },
dropfolderfileform1: { dropfolderfileadddocform: {
alternatives: [$("#userfile"), $('#choosedocsearchform1')] alternatives: [$("#userfile"), $('#choosedocsearchadddocform')]
} }
<?php <?php
} }
@ -143,11 +143,11 @@ $(document).ready(function() {
}); });
}); });
<?php <?php
$this->printKeywordChooserJs("form1"); $this->printKeywordChooserJs("adddocform");
if($libraryfolder) if($libraryfolder)
$this->printDocumentChooserJs("form1"); $this->printDocumentChooserJs("adddocform");
if($dropfolderdir) { if($dropfolderdir) {
$this->printDropFolderChooserJs("form1"); $this->printDropFolderChooserJs("adddocform");
} }
$this->printFileChooserJs(); $this->printFileChooserJs();
} /* }}} */ } /* }}} */
@ -196,7 +196,7 @@ $(document).ready(function() {
echo $txt; echo $txt;
$this->contentContainerStart(); $this->contentContainerStart();
?> ?>
<form class="form-horizontal" action="../op/op.AddDocument.php" enctype="multipart/form-data" method="post" id="form1" name="form1"> <form class="form-horizontal" action="../op/op.AddDocument.php" enctype="multipart/form-data" method="post" id="adddocform" name="adddocform">
<?php echo createHiddenFieldWithKey('adddocument'); ?> <?php echo createHiddenFieldWithKey('adddocument'); ?>
<input type="hidden" name="folderid" value="<?php print $folderid; ?>"> <input type="hidden" name="folderid" value="<?php print $folderid; ?>">
<input type="hidden" name="showtree" value="<?php echo showtree();?>"> <input type="hidden" name="showtree" value="<?php echo showtree();?>">
@ -224,7 +224,7 @@ $(document).ready(function() {
); );
$this->formField( $this->formField(
getMLText("keywords"), getMLText("keywords"),
$this->getKeywordChooserHtml('form1') $this->getKeywordChooserHtml('adddocform')
); );
$options = array(); $options = array();
$categories = $dms->getDocumentCategories(); $categories = $dms->getDocumentCategories();
@ -326,13 +326,13 @@ $(document).ready(function() {
if($dropfolderdir) { if($dropfolderdir) {
$this->formField( $this->formField(
getMLText("dropfolder_file"), getMLText("dropfolder_file"),
$this->getDropFolderChooserHtml("form1", $dropfolderfile) $this->getDropFolderChooserHtml("adddocform", $dropfolderfile)
); );
} }
if($libraryfolder) { if($libraryfolder) {
$this->formField( $this->formField(
getMLText("librarydoc"), getMLText("librarydoc"),
$this->getDocumentChooserHtml("form1", M_READ, -1, null, 'librarydoc', $librarydoc, 1) $this->getDocumentChooserHtml("adddocform", M_READ, -1, null, 'librarydoc', $libraryfolder, 1)
); );
} }
$this->formField( $this->formField(