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

rename mayOverwriteStatus() to mayOverrideStatus()

Browse Source
This commit is contained in:
Uwe Steinmann 2015-06-02 10:04:35 +02:00
parent 1bc5e6116c
commit 1123611371
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/inc.ClassAccessOperation.php
View File

@ -74,11 +74,11 @@ class SeedDMS_AccessOperation {
* The admin may even modify the status * The admin may even modify the status
* even if is disallowed in the settings. * even if is disallowed in the settings.
*/ */
function mayOverwriteStatus() { /* {{{ */ function mayOverrideStatus() { /* {{{ */
if(get_class($this->obj) == 'SeedDMS_Core_Document') { if(get_class($this->obj) == 'SeedDMS_Core_Document') {
$latestContent = $this->obj->getLatestContent(); $latestContent = $this->obj->getLatestContent();
$status = $latestContent->getStatus(); $status = $latestContent->getStatus();
if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_RELEASED || $status["status"]==S_OBSOLETE )) { if ((($this->settings->_enableVersionModification && ($this->obj->getAccessMode($this->user) == M_ALL)) || $this->user->isAdmin()) && ($status["status"]==S_DRAFT || $status["status"]==S_RELEASED || $status["status"]==S_OBSOLETE)) {
return true; return true;
} }
} }

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

@ -544,7 +544,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
if($accessop->mayRemoveVersion()) { if($accessop->mayRemoveVersion()) {
print "<li><a href=\"out.RemoveVersion.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-remove\"></i>".getMLText("rm_version")."</a></li>"; print "<li><a href=\"out.RemoveVersion.php?documentid=".$documentid."&version=".$latestContent->getVersion()."\"><i class=\"icon-remove\"></i>".getMLText("rm_version")."</a></li>";
} }
if($accessop->mayOverwriteStatus()) { if($accessop->mayOverrideStatus()) {
print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-align-justify\"></i>".getMLText("change_status")."</a></li>"; print "<li><a href='../out/out.OverrideContentStatus.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-align-justify\"></i>".getMLText("change_status")."</a></li>";
} }
if($accessop->maySetRecipients()) { if($accessop->maySetRecipients()) {