gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-04 23:22:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename approveLogId to approveLogID

Browse Source
This commit is contained in:
Uwe Steinmann 2015-06-12 12:42:37 +02:00
parent 60d3c28f6d
commit 418da4cb52
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2552,7 +2552,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
if($recs) { if($recs) {
foreach($recs as $rec) { foreach($recs as $rec) {
$queryStr= $queryStr=
"SELECT `tblDocumentApprovers`.*, `tblDocumentApproveLog`.`approveLogId`, `tblDocumentApproveLog`.`status`, ". "SELECT `tblDocumentApprovers`.*, `tblDocumentApproveLog`.`approveLogID`, `tblDocumentApproveLog`.`status`, ".
"`tblDocumentApproveLog`.`comment`, `tblDocumentApproveLog`.`date`, ". "`tblDocumentApproveLog`.`comment`, `tblDocumentApproveLog`.`date`, ".
"`tblDocumentApproveLog`.`userID`, `tblUsers`.`fullName`, `tblGroups`.`name` AS `groupName` ". "`tblDocumentApproveLog`.`userID`, `tblUsers`.`fullName`, `tblGroups`.`name` AS `groupName` ".
"FROM `tblDocumentApprovers` ". "FROM `tblDocumentApprovers` ".
@ -2560,7 +2560,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
"LEFT JOIN `tblUsers` on `tblUsers`.`id` = `tblDocumentApprovers`.`required` ". "LEFT JOIN `tblUsers` on `tblUsers`.`id` = `tblDocumentApprovers`.`required` ".
"LEFT JOIN `tblGroups` on `tblGroups`.`id` = `tblDocumentApprovers`.`required`". "LEFT JOIN `tblGroups` on `tblGroups`.`id` = `tblDocumentApprovers`.`required`".
"WHERE `tblDocumentApprovers`.`approveID` = '". $rec['approveID'] ."' ". "WHERE `tblDocumentApprovers`.`approveID` = '". $rec['approveID'] ."' ".
"ORDER BY `tblDocumentApproveLog`.`approveLogId` DESC LIMIT ".(int) $limit; "ORDER BY `tblDocumentApproveLog`.`approveLogID` DESC LIMIT ".(int) $limit;
$res = $db->getResultArray($queryStr); $res = $db->getResultArray($queryStr);
if (is_bool($res) && !$res) { if (is_bool($res) && !$res) {
@ -2568,7 +2568,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
return false; return false;
} }
foreach($res as &$t) { foreach($res as &$t) {
$filename = $this->_dms->contentDir . $this->_document->getDir().'a'.$t['approveLogId']; $filename = $this->_dms->contentDir . $this->_document->getDir().'a'.$t['approveLogID'];
if(file_exists($filename)) if(file_exists($filename))
$t['file'] = $filename; $t['file'] = $filename;
else else
@ -2995,7 +2995,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
if($file) { if($file) {
SeedDMS_Core_File::copyFile($file, $this->_dms->contentDir . $this->_document->getDir() . 'a' . $approveLogID); SeedDMS_Core_File::copyFile($file, $this->_dms->contentDir . $this->_document->getDir() . 'a' . $approveLogID);
} }
return $approveLogId; return $approveLogID;
} /* }}} */ } /* }}} */
/** /**
@ -3039,7 +3039,7 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
if($file) { if($file) {
SeedDMS_Core_File::copyFile($file, $this->_dms->contentDir . $this->_document->getDir() . 'a' . $approveLogID); SeedDMS_Core_File::copyFile($file, $this->_dms->contentDir . $this->_document->getDir() . 'a' . $approveLogID);
} }
return $approveLogId; return $approveLogID;
} /* }}} */ } /* }}} */
function delIndReviewer($user, $requestUser) { /* {{{ */ function delIndReviewer($user, $requestUser) { /* {{{ */

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

@ -587,7 +587,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
print "<td>".htmlspecialchars($a["comment"]); print "<td>".htmlspecialchars($a["comment"]);
if($a['file']) { if($a['file']) {
echo "<br />"; echo "<br />";
echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogId']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>"; echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
} }
echo "</td>\n"; echo "</td>\n";
print "<td>".getApprovalStatusText($a["status"])."</td>\n"; print "<td>".getApprovalStatusText($a["status"])."</td>\n";
@ -720,7 +720,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
echo "<br />".htmlspecialchars($rec['comment']); echo "<br />".htmlspecialchars($rec['comment']);
if($rec['file']) { if($rec['file']) {
echo "<br />"; echo "<br />";
echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$rec['approveLogId']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>"; echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$rec['approveLogID']."\" class=\"btn btn-mini\"><i class=\"icon-download\"></i> ".getMLText('download')."</a>";
} }
echo "</td>"; echo "</td>";
echo "<td>"; echo "<td>";