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

fix selection of documents/folders

Browse Source
This commit is contained in:
Uwe Steinmann 2020-09-17 13:01:14 +02:00
parent 6d7c86ffe9
commit 245a103b35
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -7,6 +7,7 @@
- import of users does not issue an error if a group column isn't set - import of users does not issue an error if a group column isn't set
- removing a document version will not remove attachments of the document anymore - removing a document version will not remove attachments of the document anymore
- make document details page like like view document page - make document details page like like view document page
- fix selection of documents/folders
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.19 Changes in version 5.1.19

4
styles/bootstrap/application.js
View File

@ -36,13 +36,13 @@ function escapeHtml(text) {
} }
function treeFolderSelected(formid, nodeid, nodename) { function treeFolderSelected(formid, nodeid, nodename) {
$('#targetid'+formid).val(nodeid); $('#'+formid).val(nodeid);
$('#choosefoldersearch'+formid).val(nodename); $('#choosefoldersearch'+formid).val(nodename);
$('#folderChooser'+formid).modal('hide'); $('#folderChooser'+formid).modal('hide');
} }
function treeDocumentSelected(formid, nodeid, nodename) { function treeDocumentSelected(formid, nodeid, nodename) {
$('#docid'+formid).val(nodeid); $('#'+formid).val(nodeid);
$('#choosedocsearch'+formid).val(nodename); $('#choosedocsearch'+formid).val(nodename);
$('#docChooser'+formid).modal('hide'); $('#docChooser'+formid).modal('hide');
} }

10
views/bootstrap/class.Bootstrap.php
View File

@ -1204,7 +1204,7 @@ $(document).ready(function() {
$formid = md5($formname.$form); $formid = md5($formname.$form);
$content = ''; $content = '';
$content .= "<input type=\"hidden\" id=\"docid".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">"; $content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
$content .= "<div class=\"input-append\">\n"; $content .= "<div class=\"input-append\">\n";
$content .= "<input type=\"text\" id=\"choosedocsearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"docname".$formid."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" value=\"" . (($default) ? htmlspecialchars($default->getName()) : "") ."\"/>"; $content .= "<input type=\"text\" id=\"choosedocsearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"docname".$formid."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" value=\"" . (($default) ? htmlspecialchars($default->getName()) : "") ."\"/>";
$content .= "<button type=\"button\" class=\"btn\" id=\"cleardocument".$form."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>"; $content .= "<button type=\"button\" class=\"btn\" id=\"cleardocument".$form."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>";
@ -1244,7 +1244,7 @@ $(document).ready(function() {
$formid = md5($formname.$form); $formid = md5($formname.$form);
?> ?>
function documentSelected<?php echo $formid ?>(id, name) { function documentSelected<?php echo $formid ?>(id, name) {
$('#docid<?php echo $formid ?>').val(id); $('#<?php echo $formid ?>').val(id);
$('#choosedocsearch<?php echo $formid ?>').val(name); $('#choosedocsearch<?php echo $formid ?>').val(name);
$('#docChooser<?php echo $formid ?>').modal('hide'); $('#docChooser<?php echo $formid ?>').modal('hide');
} }
@ -1269,7 +1269,7 @@ function folderSelected<?php echo $formid ?>(id, name) {
$formname = "targetid"; $formname = "targetid";
$formid = md5($formname.$form); $formid = md5($formname.$form);
$content = ''; $content = '';
$content .= "<input type=\"hidden\" id=\"targetid".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">"; $content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
$content .= "<div class=\"input-append\">\n"; $content .= "<div class=\"input-append\">\n";
$content .= "<input type=\"text\" id=\"choosefoldersearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"targetname".$formid."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" target=\"".$formid."\"/>"; $content .= "<input type=\"text\" id=\"choosefoldersearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"targetname".$formid."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" target=\"".$formid."\"/>";
$content .= "<button type=\"button\" class=\"btn\" id=\"clearfolder".$formid."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>"; $content .= "<button type=\"button\" class=\"btn\" id=\"clearfolder".$formid."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>";
@ -1311,7 +1311,7 @@ function folderSelected<?php echo $formid ?>(id, name) {
$formid = md5($formname.$form); $formid = md5($formname.$form);
?> ?>
function folderSelected<?php echo $formid ?>(id, name) { function folderSelected<?php echo $formid ?>(id, name) {
$('#targetid<?php echo $formid ?>').val(id); $('#<?php echo $formid ?>').val(id);
$('#choosefoldersearch<?php echo $formid ?>').val(name); $('#choosefoldersearch<?php echo $formid ?>').val(name);
$('#folderChooser<?php echo $formid ?>').modal('hide'); $('#folderChooser<?php echo $formid ?>').modal('hide');
} }
@ -1319,7 +1319,7 @@ function folderSelected<?php echo $formid ?>(id, name) {
$(document).ready(function() { $(document).ready(function() {
$('#clearfolder<?php print $formid ?>').click(function(ev) { $('#clearfolder<?php print $formid ?>').click(function(ev) {
$('#choosefoldersearch<?php echo $formid ?>').val(''); $('#choosefoldersearch<?php echo $formid ?>').val('');
$('#targetid<?php echo $formid ?>').val(''); $('#<?php echo $formid ?>').val('');
}); });
}); });
*/ */