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

Merge branch 'seeddms-5.0.x' into seeddms-5.1.x

Browse Source
This commit is contained in:
Uwe Steinmann 2017-02-13 12:48:20 +01:00
commit 42c050588b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SeedDMS_Core/Core/inc.ClassDMS.php
View File

@ -2907,14 +2907,14 @@ class SeedDMS_Core_DMS {
return $resArr;
case 'docspermonth':
$queryStr = "select *, count(`key`) as total from (select ".$this->db->getDateExtract("date", '%Y-%m')." as `key` from tblDocuments) a group by `key` order by `key`";
$queryStr = "select *, count(`key`) as total from (select ".$this->db->getDateExtract("date", '%Y-%m')." as `key` from `tblDocuments`) a group by `key` order by `key`";
$resArr = $this->db->getResultArray($queryStr);
if (!$resArr)
return false;
return $resArr;
case 'docsaccumulated':
$queryStr = "select *, count(`key`) as total from (select ".$this->db->getDateExtract("date")." as `key` from tblDocuments) a group by `key` order by `key`";
$queryStr = "select *, count(`key`) as total from (select ".$this->db->getDateExtract("date")." as `key` from `tblDocuments`) a group by `key` order by `key`";
$resArr = $this->db->getResultArray($queryStr);
if (!$resArr)
return false;

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

@ -2622,7 +2622,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
/* No need to add entries for new version because the status log
* will generate an entry as well.
$queryStr = "SELECT * FROM tblDocumentContent WHERE document = " . $this->_id;
$queryStr = "SELECT * FROM `tblDocumentContent` WHERE `document` = " . $this->_id;
$resArr = $db->getResultArray($queryStr);
if (is_bool($resArr) && $resArr == false)
return false;

4
SeedDMS_Core/Core/inc.ClassUser.php
View File

@ -928,8 +928,8 @@ class SeedDMS_Core_User { /* {{{ */
}
// TODO : update document status if reviewer/approver has been deleted
// "DELETE FROM tblDocumentApproveLog WHERE userID = " . $this->_id;
// "DELETE FROM tblDocumentReviewLog WHERE userID = " . $this->_id;
// "DELETE FROM `tblDocumentApproveLog` WHERE `userID` = " . $this->_id;
// "DELETE FROM `tblDocumentReviewLog` WHERE `userID` = " . $this->_id;
$reviewStatus = $this->getReviewStatus();