mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-09 21:16:07 +00:00
fix merge error
This commit is contained in:
parent
9e4b80e25b
commit
ed1f74baca
|
@ -144,7 +144,7 @@ class SeedDMS_AccessOperation {
|
||||||
if($r['status'] == 1 || $r['status'] == -1)
|
if($r['status'] == 1 || $r['status'] == -1)
|
||||||
$hasapproval = true;
|
$hasapproval = true;
|
||||||
}
|
}
|
||||||
if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (($status["status"]==S_DRAFT_REV && !$hasreview) || ($status["status"]==S_DRAFT_APP && !$hasreview && !$hasapproval))) {
|
if ((($this->settings->_enableVersionModification && ($document->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && (($status["status"]==S_DRAFT_REV && !$hasreview) || ($status["status"]==S_DRAFT_APP && !$hasreview && !$hasapproval))) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user