mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-08 20:46:05 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
6e124f73f1
|
@ -921,7 +921,11 @@ class SeedDMS_NotificationService {
|
|||
$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) { /* {{{ */
|
||||
|
@ -1014,7 +1018,11 @@ class SeedDMS_NotificationService {
|
|||
foreach ($nl["groups"] as $grp) {
|
||||
$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) { /* {{{ */
|
||||
|
@ -1037,7 +1045,12 @@ class SeedDMS_NotificationService {
|
|||
$this->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION);
|
||||
foreach ($nl["groups"] as $grp)
|
||||
$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);
|
||||
|
||||
} /* }}} */
|
||||
|
||||
|
|
|
@ -2162,7 +2162,7 @@ $(document).ready(function() {
|
|||
|
||||
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=\"".$_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) {
|
||||
// Add 'icon' span before title
|
||||
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
|
||||
$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
|
||||
|
|
|
@ -88,18 +88,12 @@ ul.jqtree-tree li.jqtree-selected > .jqtree-element:hover {
|
|||
font-weight: bold;
|
||||
}
|
||||
|
||||
ul.jqtree-tree ul.jqtree_common {
|
||||
margin-left: 19px;
|
||||
}
|
||||
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 {
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
||||
ul.jqtree-tree li.jqtree_common > .jqtree-element:hover {
|
||||
background-color: #E0E0E0;
|
||||
background-color: #E0E0E0;
|
||||
}
|
||||
|
||||
legend > span {
|
||||
|
|
|
@ -2251,9 +2251,9 @@ $(function() {
|
|||
onCreateLi: function(node, $li) {
|
||||
// Add 'icon' span before title
|
||||
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
|
||||
$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
|
||||
|
|
|
@ -103,18 +103,12 @@ ul.jqtree-tree li.jqtree-selected > .jqtree-element:hover {
|
|||
font-weight: bold;
|
||||
}
|
||||
|
||||
ul.jqtree-tree ul.jqtree_common {
|
||||
margin-left: 19px;
|
||||
}
|
||||
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 {
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
||||
ul.jqtree-tree li.jqtree_common > .jqtree-element:hover {
|
||||
background-color: #E0E0E0;
|
||||
background-color: #E0E0E0;
|
||||
}
|
||||
|
||||
legend > span {
|
||||
|
|
|
@ -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
|
||||
-------------------------------------------------- */
|
||||
html {
|
||||
|
|
Loading…
Reference in New Issue
Block a user