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

Merge branch 'seeddms-4.1.3' into develop

Browse Source
This commit is contained in:
Uwe Steinmann 2013-04-08 09:15:42 +02:00
commit 8b344163c8
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG
View File

@ -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 Changes in version 4.1.2
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

2
inc/inc.Utils.php
View File

@ -326,7 +326,7 @@ function _add_log_line($msg="") { /* {{{ */
function filterDocumentLinks($user, $links) { /* {{{ */ function filterDocumentLinks($user, $links) { /* {{{ */
$tmp = array(); $tmp = array();
foreach ($links as $link) 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); array_push($tmp, $link);
return $tmp; return $tmp;
} /* }}} */ } /* }}} */

4
views/blue/class.ViewDocument.php
View File

@ -299,7 +299,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Blue_Style {
case 0: // Approver is an individual. case 0: // Approver is an individual.
$required = $dms->getUser($a["required"]); $required = $dms->getUser($a["required"]);
if (!is_object($required)) { if (!is_object($required)) {
$reqName = getMLText("unknown_user")." '".$r["required"]."'"; $reqName = getMLText("unknown_user")." '".$a["required"]."'";
} }
else { else {
$reqName = htmlspecialchars($required->getFullName()); $reqName = htmlspecialchars($required->getFullName());
@ -310,7 +310,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Blue_Style {
case 1: // Approver is a group. case 1: // Approver is a group.
$required = $dms->getGroup($a["required"]); $required = $dms->getGroup($a["required"]);
if (!is_object($required)) { if (!is_object($required)) {
$reqName = getMLText("unknown_group")." '".$r["required"]."'"; $reqName = getMLText("unknown_group")." '".$a["required"]."'";
} }
else { else {
$reqName = "<i>".htmlspecialchars($required->getName())."</i>"; $reqName = "<i>".htmlspecialchars($required->getName())."</i>";

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

@ -493,7 +493,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
case 0: // Approver is an individual. case 0: // Approver is an individual.
$required = $dms->getUser($a["required"]); $required = $dms->getUser($a["required"]);
if (!is_object($required)) { if (!is_object($required)) {
$reqName = getMLText("unknown_user")." '".$r["required"]."'"; $reqName = getMLText("unknown_user")." '".$a["required"]."'";
} }
else { else {
$reqName = htmlspecialchars($required->getFullName()); $reqName = htmlspecialchars($required->getFullName());
@ -504,7 +504,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
case 1: // Approver is a group. case 1: // Approver is a group.
$required = $dms->getGroup($a["required"]); $required = $dms->getGroup($a["required"]);
if (!is_object($required)) { if (!is_object($required)) {
$reqName = getMLText("unknown_group")." '".$r["required"]."'"; $reqName = getMLText("unknown_group")." '".$a["required"]."'";
} }
else { else {
$reqName = "<i>".htmlspecialchars($required->getName())."</i>"; $reqName = "<i>".htmlspecialchars($required->getName())."</i>";