gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-11 17:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-4.2.1' into develop

Browse Source
This commit is contained in:
Uwe Steinmann 2013-04-30 08:40:38 +02:00
commit c64dc58a77
5 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -8,6 +8,7 @@
--------------------------------------------------------------------------------
- fixing jumploader upload, added missing file for uploading attachments
- various improvements of user interface
- fixed bug when adding individual approver (Core)
--------------------------------------------------------------------------------
Changes in version 4.2.0

2
SeedDMS_Core/Core/inc.ClassDocument.php
View File

@ -2640,7 +2640,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
}
}
if ( $indstatus || (isset($indstatus["status"]) && $indstatus["status"]!=-2)) {
if ( !$indstatus || (isset($indstatus["status"]) && $indstatus["status"]!=-2)) {
// Add the user into the approvers database.
$queryStr = "INSERT INTO `tblDocumentApprovers` (`documentID`, `version`, `type`, `required`) ".
"VALUES ('". $this->_document->getID() ."', '". $this->_version ."', '0', '". $userID ."')";

26
SeedDMS_Core/package.xml
View File

@ -12,11 +12,11 @@
<email>uwe@steinmann.cx</email>
<active>yes</active>
</lead>
<date>2013-04-22</date>
<time>09:18:47</time>
<date>2013-04-30</date>
<time>07:43:29</time>
<version>
<release>4.2.0</release>
<api>4.2.0</api>
<release>4.2.1</release>
<api>4.2.1</api>
</version>
<stability>
<release>stable</release>
@ -24,7 +24,7 @@
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
- added method SeedDMS_Core_DMS::filterDocumentLinks()
- fixed bug in SeedDMS_Core_DocumentContent::addIndApp()
</notes>
<contents>
<dir baseinstalldir="SeedDMS" name="/">
@ -497,5 +497,21 @@ New release
- stay in sync with seeddms application
</notes>
</release>
<release>
<date>2013-04-22</date>
<time>09:18:47</time>
<version>
<release>4.2.0</release>
<api>4.2.0</api>
</version>
<stability>
<release>stable</release>
<api>stable</api>
</stability>
<license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
<notes>
- fixed bug in SeedDMS_Core_DocumentContent::addIndApp()
</notes>
</release>
</changelog>
</package>

2
inc/inc.Utils.php
View File

@ -27,7 +27,7 @@ function formatted_size($size_bytes) { /* {{{ */
} /* }}} */
function getReadableDate($timestamp) {
return date("d.m.Y", $timestamp);
return date("d/m/Y", $timestamp);
}
function getLongReadableDate($timestamp) {

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

@ -213,6 +213,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
<td><?php print getLongReadableDate($document->getDate()); ?></td>
</tr>
<?php
if($document->expires()) {
?>
<tr>
<td><?php printMLText("expires");?>:</td>
<td><?php print getReadableDate($document->getExpires()); ?></td>
</tr>
<?php
}
if($document->getKeywords()) {
?>
<tr>
@ -364,7 +372,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
if($workflowmode == 'traditional') {
// Allow changing reviewers/approvals only if not reviewed
if($accessop->maySetReviewersApprovers()) {
print "<li><a href='../out/out.SetReviewersApprovers.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'>".getMLText("change_assignments")."</a></li>";
print "<li><a href='../out/out.SetReviewersApprovers.php?documentid=".$documentid."&version=".$latestContent->getVersion()."'><i class=\"icon-edit\"></i>".getMLText("change_assignments")."</a></li>";
}
} else {
if($accessop->maySetWorkflow()) {
@ -463,7 +471,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$reqName = getMLText("unknown_user")." '".$r["required"]."'";
}
else {
$reqName = htmlspecialchars($required->getFullName());
$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
}
if($r["required"] == $user->getId())
$is_reviewer = true;
@ -485,7 +493,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
print "<td><ul class=\"unstyled\"><li>".$r["date"]."</li>";
/* $updateUser is the user who has done the review */
$updateUser = $dms->getUser($r["userID"]);
print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()) : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</li></ul></td>";
print "<td>".htmlspecialchars($r["comment"])."</td>\n";
print "<td>".getReviewStatusText($r["status"])."</td>\n";
print "<td><ul class=\"unstyled\">";
@ -527,7 +535,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$reqName = getMLText("unknown_user")." '".$a["required"]."'";
}
else {
$reqName = htmlspecialchars($required->getFullName());
$reqName = htmlspecialchars($required->getFullName()." (".$required->getLogin().")");
}
if($a["required"] == $user->getId())
$is_approver = true;
@ -549,7 +557,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
print "<td><ul class=\"unstyled\"><li>".$a["date"]."</li>";
/* $updateUser is the user who has done the approval */
$updateUser = $dms->getUser($a["userID"]);
print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()) : "unknown user id '".$a["userID"]."'")."</li></ul></td>";
print "<li>".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."</li></ul></td>";
print "<td>".htmlspecialchars($a["comment"])."</td>\n";
print "<td>".getApprovalStatusText($a["status"])."</td>\n";
print "<td><ul class=\"unstyled\">";