gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-17 05:22:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uwe Steinmann 2016-08-22 17:16:41 +02:00
commit 169204173f
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -21,6 +21,8 @@
Changes in version 5.0.5 Changes in version 5.0.5
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
- merged changes from 4.3.28 - merged changes from 4.3.28
- fix choosing home folder of users
- fix clearing cache
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.0.4 Changes in version 5.0.4

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

@ -1173,22 +1173,22 @@ function folderSelected<?php echo $formName ?>(id, name) {
<?php <?php
} /* }}} */ } /* }}} */
function printFolderChooserJs($formName) { /* {{{ */ function printFolderChooserJs($form) { /* {{{ */
?> ?>
function folderSelected<?php echo $formName ?>(id, name) { function folderSelected<?php echo $form ?>(id, name) {
$('#targetid<?php echo $formName ?>').val(id); $('#targetid<?php echo $form ?>').val(id);
$('#choosefoldersearch<?php echo $formName ?>').val(name); $('#choosefoldersearch<?php echo $form ?>').val(name);
$('#folderChooser<?php echo $formName ?>').modal('hide'); $('#folderChooser<?php echo $form ?>').modal('hide');
} }
<?php <?php
} /* }}} */ } /* }}} */
function printFolderChooser($formName, $accessMode, $exclude = -1, $default = false) { /* {{{ */ function printFolderChooser($form, $accessMode, $exclude = -1, $default = false, $formname='') { /* {{{ */
$this->printFolderChooserHtml($formName, $accessMode, $exclude, $default); $this->printFolderChooserHtml($form, $accessMode, $exclude, $default, $formname);
?> ?>
<script language="JavaScript"> <script language="JavaScript">
<?php <?php
$this->printFolderChooserJs($formName); $this->printFolderChooserJs($form);
?> ?>
</script> </script>
<?php <?php