From 98450f2abfcb64ef84357088db612ff731749fe9 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Apr 2013 09:09:44 +0200 Subject: [PATCH 1/4] fix code to check if user is required for approval or review --- views/blue/class.ViewDocument.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/blue/class.ViewDocument.php b/views/blue/class.ViewDocument.php index a157f64f3..649edf329 100644 --- a/views/blue/class.ViewDocument.php +++ b/views/blue/class.ViewDocument.php @@ -299,7 +299,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Blue_Style { case 0: // Approver is an individual. $required = $dms->getUser($a["required"]); if (!is_object($required)) { - $reqName = getMLText("unknown_user")." '".$r["required"]."'"; + $reqName = getMLText("unknown_user")." '".$a["required"]."'"; } else { $reqName = htmlspecialchars($required->getFullName()); @@ -310,7 +310,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Blue_Style { case 1: // Approver is a group. $required = $dms->getGroup($a["required"]); if (!is_object($required)) { - $reqName = getMLText("unknown_group")." '".$r["required"]."'"; + $reqName = getMLText("unknown_group")." '".$a["required"]."'"; } else { $reqName = "".htmlspecialchars($required->getName()).""; From 0565e9c55dd41e23a96545e5db53e228ffb4946e Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Apr 2013 09:12:56 +0200 Subject: [PATCH 2/4] fix code to determine if user is required for review --- views/bootstrap/class.ViewDocument.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index b9faf82a9..33ad75eaa 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -493,7 +493,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { case 0: // Approver is an individual. $required = $dms->getUser($a["required"]); if (!is_object($required)) { - $reqName = getMLText("unknown_user")." '".$r["required"]."'"; + $reqName = getMLText("unknown_user")." '".$a["required"]."'"; } else { $reqName = htmlspecialchars($required->getFullName()); @@ -504,7 +504,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { case 1: // Approver is a group. $required = $dms->getGroup($a["required"]); if (!is_object($required)) { - $reqName = getMLText("unknown_group")." '".$r["required"]."'"; + $reqName = getMLText("unknown_group")." '".$a["required"]."'"; } else { $reqName = "".htmlspecialchars($required->getName()).""; From ca5705d086470eb1f88bb5261839292c34323f66 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Apr 2013 09:13:36 +0200 Subject: [PATCH 3/4] fix calling getID() of user added a document link --- inc/inc.Utils.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php index 2492d4174..f5340f320 100644 --- a/inc/inc.Utils.php +++ b/inc/inc.Utils.php @@ -326,7 +326,7 @@ function _add_log_line($msg="") { /* {{{ */ function filterDocumentLinks($user, $links) { /* {{{ */ $tmp = array(); foreach ($links as $link) - if ($link->isPublic() || ($link->getUser()->getID == $user->getID()) || $user->isAdmin()) + if ($link->isPublic() || ($link->getUser()->getID() == $user->getID()) || $user->isAdmin()) array_push($tmp, $link); return $tmp; } /* }}} */ From 347b95bd6b942e4ac0bf2442d09c708ee96ed123 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 8 Apr 2013 09:15:08 +0200 Subject: [PATCH 4/4] added changes for 4.1.3 --- CHANGELOG | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 43c66a3c6..c8c127d04 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,11 @@ +-------------------------------------------------------------------------------- + Changes in version 4.1.3 +-------------------------------------------------------------------------------- +- fixed setting document link (no more PHP fatal error) +- fixed typo in variable name which cause a PHP warning when sending the + notification mail after updating a folder comment +- fixed code to determine required approver and reviewer + -------------------------------------------------------------------------------- Changes in version 4.1.2 --------------------------------------------------------------------------------