gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-08 20:46:05 +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 2021-12-01 11:14:22 +01:00
commit 6e124f73f1
6 changed files with 27 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
inc/inc.ClassNotificationService.php
View File

@ -921,7 +921,11 @@ class SeedDMS_NotificationService {
$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); $this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
} }
// $this->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER); /* Send mail to owner only if the currently logged in user is not the
* owner and the owner is not already in the list of notifiers.
*/
if($user->getID() != $document->getOwner()->getID() && false === SeedDMS_Core_DMS::inList($document->getOwner(), $nl['users']))
$this->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
} /* }}} */ } /* }}} */
public function sendNewDocumentNotifyMail($document, $user, $obj) { /* {{{ */ public function sendNewDocumentNotifyMail($document, $user, $obj) { /* {{{ */
@ -1014,7 +1018,11 @@ class SeedDMS_NotificationService {
foreach ($nl["groups"] as $grp) { foreach ($nl["groups"] as $grp) {
$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); $this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
} }
// $this->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER); /* Send mail to owner only if the currently logged in user is not the
* owner and the owner is not already in the list of notifiers.
*/
if($user->getID() != $document->getOwner()->getID() && false === SeedDMS_Core_DMS::inList($document->getOwner(), $nl['users']))
$this->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
} /* }}} */ } /* }}} */
public function sendSubmittedApprovalMail($content, $user, $approvelog) { /* {{{ */ public function sendSubmittedApprovalMail($content, $user, $approvelog) { /* {{{ */
@ -1037,7 +1045,12 @@ class SeedDMS_NotificationService {
$this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); $this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
foreach ($nl["groups"] as $grp) foreach ($nl["groups"] as $grp)
$this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); $this->toGroup($user, $grp, $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
// $this->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
/* Send mail to owner only if the currently logged in user is not the
* owner and the owner is not already in the list of notifiers.
*/
if($user->getID() != $document->getOwner()->getID() && false === SeedDMS_Core_DMS::inList($document->getOwner(), $nl['users']))
$this->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER);
} /* }}} */ } /* }}} */

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

@ -2162,7 +2162,7 @@ $(document).ready(function() {
function printNewTreeNavigationHtml($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0, $orderby='') { /* {{{ */ function printNewTreeNavigationHtml($folderid=0, $accessmode=M_READ, $showdocs=0, $formid='form1', $expandtree=0, $orderby='') { /* {{{ */
//echo "<div id=\"jqtree".$formid."\" style=\"margin-left: 10px;\" data-url=\"../op/op.Ajax.php?command=subtree&showdocs=".$showdocs."&orderby=".$orderby."\"></div>\n"; //echo "<div id=\"jqtree".$formid."\" style=\"margin-left: 10px;\" data-url=\"../op/op.Ajax.php?command=subtree&showdocs=".$showdocs."&orderby=".$orderby."\"></div>\n";
echo "<div id=\"jqtree".$formid."\" style=\"margin-left: 10px;\" data-url=\"".$_SERVER['SCRIPT_NAME']."?action=subtree\"></div>\n"; echo "<div id=\"jqtree".$formid."\" data-url=\"".$_SERVER['SCRIPT_NAME']."?action=subtree\"></div>\n";
} /* }}} */ } /* }}} */
/** /**
@ -2289,9 +2289,9 @@ $(function() {
onCreateLi: function(node, $li) { onCreateLi: function(node, $li) {
// Add 'icon' span before title // Add 'icon' span before title
if(node.is_folder) if(node.is_folder)
$li.find('.jqtree-title').before('<i class="fa fa-folder-o table-row-folder droptarget" data-droptarget="folder_' + node.id + '" rel="folder_' + node.id + '"></i> ').attr('data-name', node.name).attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey(''); ?>').attr('data-uploadformtoken', '<?php echo createFormKey(''); ?>').attr('data-droptarget', 'folder_' + node.id).addClass('droptarget'); $li.find('.jqtree-title').prepend('<i class="fa fa-folder-o"></i> ').attr('data-name', node.name).attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey(''); ?>').attr('data-uploadformtoken', '<?php echo createFormKey(''); ?>').attr('data-droptarget', 'folder_' + node.id).addClass('droptarget');
else else
$li.find('.jqtree-title').before('<i class="fa fa-file"></i> '); $li.find('.jqtree-title').prepend('<i class="fa fa-file"></i> ');
} }
}); });
// Unfold node for currently selected folder // Unfold node for currently selected folder

12
views/bootstrap/styles/application.css
View File

@ -88,18 +88,12 @@ ul.jqtree-tree li.jqtree-selected > .jqtree-element:hover {
font-weight: bold; font-weight: bold;
} }
ul.jqtree-tree ul.jqtree_common { ul.jqtree-tree li.jqtree_common {
margin-left: 19px; margin-left: 8px;
}
ul.jqtree-tree .jqtree-title {
margin-left: 0.5em;
}
ul.jqtree-tree .jqtree-title.jqtree-title-folder {
margin-left: 0.5em;
} }
ul.jqtree-tree li.jqtree_common > .jqtree-element:hover { ul.jqtree-tree li.jqtree_common > .jqtree-element:hover {
background-color: #E0E0E0; background-color: #E0E0E0;
} }
legend > span { legend > span {

4
views/bootstrap4/class.Bootstrap4.php
View File

@ -2251,9 +2251,9 @@ $(function() {
onCreateLi: function(node, $li) { onCreateLi: function(node, $li) {
// Add 'icon' span before title // Add 'icon' span before title
if(node.is_folder) if(node.is_folder)
$li.find('.jqtree-title').before('<i class="fa fa-folder-o table-row-folder droptarget" data-droptarget="folder_' + node.id + '" rel="folder_' + node.id + '"></i> ').attr('data-name', node.name).attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey(''); ?>').attr('data-uploadformtoken', '<?php echo createFormKey(''); ?>').attr('data-droptarget', 'folder_' + node.id).addClass('droptarget'); $li.find('.jqtree-title').prepend('<i class="fa fa-folder-o"></i> ').attr('data-name', node.name).attr('rel', 'folder_' + node.id).attr('formtoken', '<?php echo createFormKey(''); ?>').attr('data-uploadformtoken', '<?php echo createFormKey(''); ?>').attr('data-droptarget', 'folder_' + node.id).addClass('droptarget');
else else
$li.find('.jqtree-title').before('<i class="fa fa-file"></i> '); $li.find('.jqtree-title').prepend('<i class="fa fa-file"></i> ');
} }
}); });
// Unfold node for currently selected folder // Unfold node for currently selected folder

12
views/bootstrap4/styles/application.css
View File

@ -103,18 +103,12 @@ ul.jqtree-tree li.jqtree-selected > .jqtree-element:hover {
font-weight: bold; font-weight: bold;
} }
ul.jqtree-tree ul.jqtree_common { ul.jqtree-tree li.jqtree_common {
margin-left: 19px; margin-left: 8px;
}
ul.jqtree-tree .jqtree-title {
margin-left: 0.5em;
}
ul.jqtree-tree .jqtree-title.jqtree-title-folder {
margin-left: 0.5em;
} }
ul.jqtree-tree li.jqtree_common > .jqtree-element:hover { ul.jqtree-tree li.jqtree_common > .jqtree-element:hover {
background-color: #E0E0E0; background-color: #E0E0E0;
} }
legend > span { legend > span {

19
views/bootstrap4/styles/styles.css
View File

@ -1,22 +1,3 @@
ul.jqtree-tree ul.jqtree_common {
margin-left: 22px;
}
ul.jqtree-tree li.jqtree_common {
margin-left: 0px;
}
ul.jqtree-tree li.jqtree_folder {
margin-left: 0px;
}
ul.jqtree-tree .jqtree-title {
margin-left: 0.3em;
}
ul.jqtree-tree .jqtree-title.jqtree-title-folder {
margin-left: 0.3em;
}
#jqtreemaintree ul.jqtree-tree .jqtree-element {
display: initial;
}
/* Sticky footer styles /* Sticky footer styles
-------------------------------------------------- */ -------------------------------------------------- */
html { html {