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

fix list of menuitems, fix user in protocol log

Browse Source
This commit is contained in:
Uwe Steinmann 2019-02-04 14:43:57 +01:00
parent 3855603dbf
commit fdb848d5bb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
/* We still need unsafe-eval, because printDocumentChooserHtml and /* We still need unsafe-eval, because printDocumentChooserHtml and
* printFolderChooserHtml will include a javascript file with ajax * printFolderChooserHtml will include a javascript file with ajax
* which is evaluated by jquery * which is evaluated by jquery
* worker-src blob: is needed for cytoscape
* X-WebKit-CSP is deprecated, Chrome understands Content-Security-Policy * X-WebKit-CSP is deprecated, Chrome understands Content-Security-Policy
* since version 25+ * since version 25+
* X-Content-Security-Policy is deprecated, Firefox understands * X-Content-Security-Policy is deprecated, Firefox understands
@ -595,7 +596,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
if ($this->params['enableusersview']){ if ($this->params['enableusersview']){
$menuitems['users'] = array('link'=>"../out/out.UsrView.php", 'label'=>'users'); $menuitems['users'] = array('link'=>"../out/out.UsrView.php", 'label'=>'users');
$menuitems['users'] = array('link'=>"../out/out.GroupView.php", 'label'=>'groups'); $menuitems['groups'] = array('link'=>"../out/out.GroupView.php", 'label'=>'groups');
} }
/* Check if hook exists because otherwise callHook() will override $menuitems */ /* Check if hook exists because otherwise callHook() will override $menuitems */
@ -2597,7 +2598,7 @@ $(document).ready(function() {
echo "<td>"; echo "<td>";
echo "<i style=\"font-size: 80%;\">".$rec['date']." - "; echo "<i style=\"font-size: 80%;\">".$rec['date']." - ";
$updateuser = $dms->getUser($rec["userID"]); $updateuser = $dms->getUser($rec["userID"]);
if(!is_object($required)) if(!is_object($updateuser))
echo getMLText("unknown_user"); echo getMLText("unknown_user");
else else
echo htmlspecialchars($updateuser->getFullName()." (".$updateuser->getLogin().")"); echo htmlspecialchars($updateuser->getFullName()." (".$updateuser->getLogin().")");