From 65f36e13ccd6929083ff93d8fb78dad77a652a10 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 7 Aug 2015 13:42:51 +0200 Subject: [PATCH 1/4] note about new languages --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From cbf40c2b6f619f2a508b6855c7a71d8bb565059f Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 7 Aug 2015 14:21:32 +0200 Subject: [PATCH 2/4] mayApprove() returns false if status is S_REJECTED this must be the case because if a document was rejected during review the approval process may not happen anymore. The disadvantages is, that a document which was rejected during approval cannot not be released anymore. --- inc/inc.ClassAccessOperation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/inc.ClassAccessOperation.php b/inc/inc.ClassAccessOperation.php index 8eed9f419..b565a1333 100644 --- a/inc/inc.ClassAccessOperation.php +++ b/inc/inc.ClassAccessOperation.php @@ -226,7 +226,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; } } From d7223bc521c109a23b183de7951cf2d48e98ce6a Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 7 Aug 2015 14:29:32 +0200 Subject: [PATCH 3/4] fix link to downloadable file in printProtocol() --- views/bootstrap/class.Bootstrap.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 5dab0962e..7aee2fb8f 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1904,6 +1904,7 @@ mayscript> */ protected function printProtocol($latestContent, $type="") { /* {{{ */ $dms = $this->params['dms']; + $document = $latestContent->getDocument(); ?> @@ -1957,13 +1958,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; } From ae98b574b7d47ed38f44ac90adb5aa7f7b7b5693 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 7 Aug 2015 15:44:06 +0200 Subject: [PATCH 4/4] jump to homefolder of user --- op/op.SubstituteUser.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/op/op.SubstituteUser.php b/op/op.SubstituteUser.php index b47f286f2..9e366de98 100644 --- a/op/op.SubstituteUser.php +++ b/op/op.SubstituteUser.php @@ -44,6 +44,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))); +} ?>