mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-14 13:42:04 +00:00
SeedDMS_Core_DMS::getDocumentList() uses ambiguous column name when sorting by status
This commit is contained in:
parent
3931227789
commit
68a16ce372
|
@ -1244,7 +1244,7 @@ class SeedDMS_Core_DMS {
|
||||||
$queryStr .= " AND `tblDocumentReviewLog`.`status` = 0 ";
|
$queryStr .= " AND `tblDocumentReviewLog`.`status` = 0 ";
|
||||||
if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
|
if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
|
||||||
else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
|
else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
|
||||||
else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
|
else if ($orderby=='s') $queryStr .= "ORDER BY `tblDocumentStatusLog`.`status`";
|
||||||
else $queryStr .= "ORDER BY `name`";
|
else $queryStr .= "ORDER BY `name`";
|
||||||
$queryStr .= " ".$orderdir;
|
$queryStr .= " ".$orderdir;
|
||||||
} else {
|
} else {
|
||||||
|
@ -1326,7 +1326,7 @@ class SeedDMS_Core_DMS {
|
||||||
$queryStr .= " AND `tblDocumentApproveLog`.`status` = 0 ";
|
$queryStr .= " AND `tblDocumentApproveLog`.`status` = 0 ";
|
||||||
if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
|
if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
|
||||||
else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
|
else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
|
||||||
else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
|
else if ($orderby=='s') $queryStr .= "ORDER BY `tblDocumentStatusLog`.`status`";
|
||||||
else $queryStr .= "ORDER BY `name`";
|
else $queryStr .= "ORDER BY `name`";
|
||||||
$queryStr .= " ".$orderdir;
|
$queryStr .= " ".$orderdir;
|
||||||
} else {
|
} else {
|
||||||
|
@ -1405,7 +1405,7 @@ class SeedDMS_Core_DMS {
|
||||||
$queryStr .= " AND `tblDocumentReceiptLog`.`status` = 0 ";
|
$queryStr .= " AND `tblDocumentReceiptLog`.`status` = 0 ";
|
||||||
if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
|
if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
|
||||||
else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
|
else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
|
||||||
else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
|
else if ($orderby=='s') $queryStr .= "ORDER BY `tblDocumentStatusLog`.`status`";
|
||||||
else $queryStr .= "ORDER BY `name`";
|
else $queryStr .= "ORDER BY `name`";
|
||||||
$queryStr .= " ".$orderdir;
|
$queryStr .= " ".$orderdir;
|
||||||
} else {
|
} else {
|
||||||
|
@ -1479,7 +1479,7 @@ class SeedDMS_Core_DMS {
|
||||||
$queryStr .= " AND `tblDocumentRevisionLog`.`status` = 0 ";
|
$queryStr .= " AND `tblDocumentRevisionLog`.`status` = 0 ";
|
||||||
if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
|
if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
|
||||||
else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
|
else if ($orderby=='u') $queryStr .= "ORDER BY `statusDate`";
|
||||||
else if ($orderby=='s') $queryStr .= "ORDER BY `status`";
|
else if ($orderby=='s') $queryStr .= "ORDER BY `tblDocumentStatusLog`.`status`";
|
||||||
else $queryStr .= "ORDER BY `name`";
|
else $queryStr .= "ORDER BY `name`";
|
||||||
$queryStr .= " ".$orderdir;
|
$queryStr .= " ".$orderdir;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
<email>uwe@steinmann.cx</email>
|
<email>uwe@steinmann.cx</email>
|
||||||
<active>yes</active>
|
<active>yes</active>
|
||||||
</lead>
|
</lead>
|
||||||
<date>2021-01-27</date>
|
<date>2021-02-11</date>
|
||||||
<time>13:44:55</time>
|
<time>13:44:55</time>
|
||||||
<version>
|
<version>
|
||||||
<release>6.0.15</release>
|
<release>6.0.15</release>
|
||||||
|
@ -26,6 +26,7 @@
|
||||||
<notes>
|
<notes>
|
||||||
- add searching for revision date
|
- add searching for revision date
|
||||||
- expired documents can be skipped from counting in countTasks()
|
- expired documents can be skipped from counting in countTasks()
|
||||||
|
- SeedDMS_Core_DMS::getDocumentList() uses ambiguous column name when sorting by status
|
||||||
</notes>
|
</notes>
|
||||||
<contents>
|
<contents>
|
||||||
<dir baseinstalldir="SeedDMS" name="/">
|
<dir baseinstalldir="SeedDMS" name="/">
|
||||||
|
|
Loading…
Reference in New Issue
Block a user