gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-04 23:22:24 +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 2020-01-24 08:49:21 +01:00
commit eba7f208d5
6 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -6,8 +6,6 @@ which has not the expected result.
Show message on doc info page if documents expects an action like review,
approval, etc.
Import and export of a workflow as xml.
Find a way to make the workflows adjustable when used for a document.
e.g. a workflow shall be used for a number of document but the users of
a transtion has to be altered for each document. This is basically reusing

2
utils/xmlimport.php
View File

@ -882,7 +882,7 @@ function insert_folder($folder) { /* {{{ */
if(in_array('folders', $sections)) {
if(!array_key_exists($folder['attributes']['owner'], $objmap['users'])) {
$logger->warning("Owner of folder cannot be mapped using default user");
$owner = $defaultuser;
$owner = $defaultUser;
} else {
$owner = $dms->getUser($objmap['users'][(int) $folder['attributes']['owner']]);
}

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

@ -201,7 +201,13 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
header('Content-Type: application/javascript');
echo "var seeddms_absbaseprefix=\"".$this->params['absbaseprefix']."\";\n";
echo "var seeddms_webroot=\"".$this->params['settings']->_httpRoot."\";\n";
echo "var seeddms_folder=1;\n";
/* Place the current folder id in a js variable, just in case some js code
* needs it, e.g. for reloading parts of the page via ajax.
*/
if(!empty($_REQUEST['folderid']))
echo "var seeddms_folder=".(int) $_REQUEST['folderid'].";\n";
else
echo "var seeddms_folder=0;\n";
} /* }}} */
function footerjs() { /* {{{ */

2
views/bootstrap/class.ExtensionMgr.php
View File

@ -357,7 +357,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
<h3 id="extensionChangelogLabel"><?= getMLText("extension_changelog") ?></h3>
</div>
<div class="modal-body">
<p><?php printMLText('extension_loading') ?></p>
<p><?php printMLText('changelog_loading') ?></p>
</div>
<div class="modal-footer">
<button class="btn btn-primary" data-dismiss="modal" aria-hidden="true"><?php printMLText("close") ?></button>

2
views/bootstrap/class.LogManagement.php
View File

@ -148,7 +148,7 @@ $(document).ready( function() {
</div>
<div class="modal hide" style="width: 900px; margin-left: -450px;" id="logViewer" tabindex="-1" role="dialog" aria-labelledby="docChooserLabel" aria-hidden="true">
<div class="modal-body">
<p>Please wait, until document tree is loaded …</p>
<p><?php printMLText('logfile_loading') ?></p>
</div>
<div class="modal-footer">
<button class="btn btn-primary" data-dismiss="modal" aria-hidden="true"><?php print getMLText("close"); ?></button>

2
views/bootstrap/class.ViewFolder.php
View File

@ -160,7 +160,7 @@ $(window).scroll(function() {
loadMoreObjects($('#loadmore'), $('#loadmore').data('limit'));
}
});
$('#loadmore').click(function(e) {
$('body').on('click', '#loadmore', function(e) {
loadMoreObjects($(this), $(this).data('all'));
});