gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-16 06:31:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

output warning if list of recipients contains disabled users

Browse Source
This commit is contained in:
Uwe Steinmann 2024-02-07 09:41:40 +01:00
parent fb37e526cc
commit 192e750f00
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
views/bootstrap/class.ViewDocument.php
View File

@ -1233,7 +1233,7 @@ $(document).ready( function() {
print getReviewStatusText($r["status"])."</td>\n"; print getReviewStatusText($r["status"])."</td>\n";
print "<td><ul class=\"actions unstyled\">"; print "<td><ul class=\"actions unstyled\">";
if($accesserr) if($accesserr)
echo "<li><span class=\"text-error\">".$accesserr."</span></li>"; echo "<li><span class=\"text-error text-danger\">".$accesserr."</span></li>";
if($accessobject->mayReview($latestContent->getDocument())) { if($accessobject->mayReview($latestContent->getDocument())) {
if ($is_reviewer) { if ($is_reviewer) {
@ -1339,7 +1339,7 @@ $(document).ready( function() {
print getApprovalStatusText($a["status"])."</td>\n"; print getApprovalStatusText($a["status"])."</td>\n";
print "<td><ul class=\"actions unstyled\">"; print "<td><ul class=\"actions unstyled\">";
if($accesserr) if($accesserr)
echo "<li><span class=\"text-error\">".$accesserr."</span></li>"; echo "<li><span class=\"text-error text-danger\">".$accesserr."</span></li>";
if($accessobject->mayApprove($latestContent->getDocument())) { if($accessobject->mayApprove($latestContent->getDocument())) {
if ($is_approver) { if ($is_approver) {
@ -1627,7 +1627,7 @@ $(document).ready( function() {
print "<thead>\n"; print "<thead>\n";
print "<tr>\n"; print "<tr>\n";
print "<th width='20%'>".((count($receiptStatus) > 10) ? '<input type="text" id="filterRecipientsInput" placeholder="'.getMLText('type_to_filter').'">' : getMLText('name'))."</th>\n"; print "<th width='20%'>".((count($receiptStatus) > 10) ? '<input class="form-control" type="text" id="filterRecipientsInput" placeholder="'.getMLText('type_to_filter').'">' : getMLText('name'))."</th>\n";
print "<th width='20%'>".getMLText("last_update")."</th>\n"; print "<th width='20%'>".getMLText("last_update")."</th>\n";
print "<th width='25%'>".getMLText("comment")."</th>"; print "<th width='25%'>".getMLText("comment")."</th>";
print "<th width='15%'>".getMLText("status")."</th>\n"; print "<th width='15%'>".getMLText("status")."</th>\n";
@ -1637,6 +1637,8 @@ $(document).ready( function() {
print "<tbody>\n"; print "<tbody>\n";
$stat = array('-1'=>0, '0'=>0, '1'=>0, '-2'=>0); $stat = array('-1'=>0, '0'=>0, '1'=>0, '-2'=>0);
$disabledcount = 0;
$removedusers = '';
foreach ($receiptStatus as $r) { foreach ($receiptStatus as $r) {
$required = null; $required = null;
$is_recipient = false; $is_recipient = false;
@ -1652,8 +1654,10 @@ $(document).ready( function() {
if($user->isAdmin()) { if($user->isAdmin()) {
if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ) if($document->getAccessMode($required) < M_READ || $latestContent->getAccessMode($required) < M_READ)
$accesserr = getMLText("access_denied"); $accesserr = getMLText("access_denied");
elseif(is_object($required) && $required->isDisabled()) elseif(is_object($required) && $required->isDisabled()) {
$disabledcount++;
$accesserr = getMLText("login_disabled_title"); $accesserr = getMLText("login_disabled_title");
}
} }
} }
if($r["required"] == $user->getId()/* && ($user->getId() != $owner->getId() || $enableownerreceipt == 1)*/) if($r["required"] == $user->getId()/* && ($user->getId() != $owner->getId() || $enableownerreceipt == 1)*/)
@ -1676,7 +1680,7 @@ $(document).ready( function() {
} }
break; break;
} }
/* Do not list users that has been removed from the list of recipients /* Do not list users that have been removed from the list of recipients
* unless admin is logged in. * unless admin is logged in.
*/ */
if($user->isAdmin() || $r["status"] > -2) { if($user->isAdmin() || $r["status"] > -2) {
@ -1703,7 +1707,7 @@ $(document).ready( function() {
print getReceiptStatusText($r["status"])."</td>\n"; print getReceiptStatusText($r["status"])."</td>\n";
print "<td><ul class=\"actions unstyled\">"; print "<td><ul class=\"actions unstyled\">";
if($accesserr) if($accesserr)
echo "<li><span class=\"text-error\">".$accesserr."</span></li>"; echo "<li><span class=\"text-error text-danger\">".$accesserr."</span></li>";
if($accessobject->mayReceipt($document)) { if($accessobject->mayReceipt($document)) {
if ($is_recipient) { if ($is_recipient) {
if($r["status"]==0) { if($r["status"]==0) {
@ -1722,6 +1726,9 @@ $(document).ready( function() {
<tbody> <tbody>
</table> </table>
<?php <?php
if($disabledcount) {
$this->warningMsg(getMLText('list_of_recipients_has_disabled_users'));
}
// $this->contentContainerEnd(); // $this->contentContainerEnd();
if($accessobject->check_view_access('ViewDocument', array('action'=>'receptionBar'))/* $user->isAdmin() || $user->getId() == $document->getOwner()->getId()*/) { if($accessobject->check_view_access('ViewDocument', array('action'=>'receptionBar'))/* $user->isAdmin() || $user->getId() == $document->getOwner()->getId()*/) {
/* Do not count entries '-2' as they are removed userѕ */ /* Do not count entries '-2' as they are removed userѕ */
@ -1834,7 +1841,7 @@ $(document).ready( function() {
print getRevisionStatusText($r["status"])."</td>\n"; print getRevisionStatusText($r["status"])."</td>\n";
print "<td><ul class=\"actions unstyled\">"; print "<td><ul class=\"actions unstyled\">";
if($accesserr) if($accesserr)
echo "<li><span class=\"text-error\">".$accesserr."</span></li>"; echo "<li><span class=\"text-error text-danger\">".$accesserr."</span></li>";
if($accessobject->mayRevise($document)) { if($accessobject->mayRevise($document)) {
if ($is_recipient && $r["status"]==0) { if ($is_recipient && $r["status"]==0) {
print $this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_revision"), false, true, array('<li>', '</li>')); print $this->html_link('ReviseDocument', array('documentid'=>$documentid, 'version'=>$latestContent->getVersion(), 'revisionid'=>$r['revisionID']), array('class'=>'btn btn-mini btn-primary'), getMLText("add_revision"), false, true, array('<li>', '</li>'));