tonyair
/
silverstripe-gridfieldextensions
mirror of https://github.com/symbiote/silverstripe-gridfieldextensions.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #216 from dhensby/pulls/2.0/decouple-db-now 

Use Datetime::now() for last edited updates in OrderableRows
This commit is contained in:
Robbie Averill 2017-09-23 07:58:58 +12:00 committed by GitHub
parent 09f6cdf299 9d4ac960a7
commit b6f03225d0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/GridFieldOrderableRows.php
View File

@ -470,12 +470,13 @@ class GridFieldOrderableRows extends RequestHandler implements
$sortTable = $this->getSortTable($list);
$additionalSQL = '';
$baseTable = $sortTable;
$now = SS_Datetime::now()->Rfc2822();
if(class_exists($sortTable)) {
$baseTable = singleton($sortTable)->baseTable();
}
$isBaseTable = ($baseTable == $sortTable);
if(!$list instanceof ManyManyList && $isBaseTable){
$additionalSQL = ', "LastEdited" = NOW()';
$additionalSQL = ", \"LastEdited\" = '$now'";
}
foreach($sortedIDs as $sortValue => $id) {
@ -491,7 +492,7 @@ class GridFieldOrderableRows extends RequestHandler implements
if(!$isBaseTable) {
DB::query(sprintf(
'UPDATE "%s" SET "LastEdited" = NOW() WHERE %s',
"UPDATE \"%s\" SET \"LastEdited\" = '$now' WHERE %s",
$baseTable,
$this->getSortTableClauseForIds($list, $id)
));
@ -520,6 +521,7 @@ class GridFieldOrderableRows extends RequestHandler implements
$field = $this->getSortField();
$table = $this->getSortTable($list);
$clause = sprintf('"%s"."%s" = 0', $table, $this->getSortField());
$now = SS_Datetime::now()->Rfc2822();
$additionalSQL = '';
$baseTable = $table;
@ -528,7 +530,7 @@ class GridFieldOrderableRows extends RequestHandler implements
}
$isBaseTable = ($baseTable == $table);
if(!$list instanceof ManyManyList && $isBaseTable){
$additionalSQL = ', "LastEdited" = NOW()';
$additionalSQL = ", \"LastEdited\" = '$now'";
}
foreach($list->where($clause)->column('ID') as $id) {
@ -546,7 +548,7 @@ class GridFieldOrderableRows extends RequestHandler implements
if(!$isBaseTable) {
DB::query(sprintf(
'UPDATE "%s" SET "LastEdited" = NOW() WHERE %s',
"UPDATE \"%s\" SET \"LastEdited\" = '$now' WHERE %s",
$baseTable,
$this->getSortTableClauseForIds($list, $id)
));