diff --git a/CHANGELOG b/CHANGELOG index 04199ade1..b2e96f739 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,7 +5,7 @@ - MyDocumets: list only documents to approve which have passed review - show preview image in Review/Approval summary - timeout for external commands for creating fulltext index can be set -- add translations for korean +- add translations for korean, croation, ukrainian -------------------------------------------------------------------------------- Changes in version 4.3.19 diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php index ad4d7307a..439e3c404 100644 --- a/inc/inc.ClassAccessOperation.php +++ b/inc/inc.ClassAccessOperation.php @@ -266,7 +266,7 @@ class SeedDMS_AccessOperation { if(get_class($this->obj) == $this->dms->getClassname('document')) { $latestContent = $this->obj->getLatestContent(); $status = $latestContent->getStatus(); - if ($status["status"]!=S_OBSOLETE && $status["status"]!=S_DRAFT_REV) { + if ($status["status"]!=S_OBSOLETE && $status["status"]!=S_DRAFT_REV && $status["status"]!=S_REJECTED) { return true; } } diff --git a/op/op.SubstituteUser.php b/op/op.SubstituteUser.php index ad460c733..bf11d2488 100644 --- a/op/op.SubstituteUser.php +++ b/op/op.SubstituteUser.php @@ -54,6 +54,14 @@ $session->setSu($_GET['userid']); $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_substituted_user'))); add_log_line("?userid=".$_GET["userid"]); -header("Location: ../".(isset($settings->_siteDefaultPage) && strlen($settings->_siteDefaultPage)>0 ? $settings->_siteDefaultPage : "out/out.ViewFolder.php?folderid=".$settings->_rootFolderID)); + +$newuser = $dms->getUser($_GET["userid"]); + +if (isset($referuri) && strlen($referuri)>0) { + header("Location: http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'] . $referuri); +} +else { + header("Location: ".$settings->_httpRoot.(isset($settings->_siteDefaultPage) && strlen($settings->_siteDefaultPage)>0 ? $settings->_siteDefaultPage : "out/out.ViewFolder.php?folderid=".($newuser->getHomeFolder() ? $newuser->getHomeFolder() : $settings->_rootFolderID))); +} ?> diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 7e9a6f42d..96928e65a 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -2119,6 +2119,7 @@ mayscript> */ protected function printProtocol($latestContent, $type="") { /* {{{ */ $dms = $this->params['dms']; + $document = $latestContent->getDocument(); ?> @@ -2178,13 +2179,13 @@ mayscript> case "review": if($rec['file']) { echo "
"; - echo " ".getMLText('download').""; + echo "getID()."&reviewlogid=".$rec['reviewLogID']."\" class=\"btn btn-mini\"> ".getMLText('download').""; } break; case "approval": if($rec['file']) { echo "
"; - echo " ".getMLText('download').""; + echo "getID()."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"> ".getMLText('download').""; } break; }