EZP-30782: allow sorting by trashed field (ezsystems#1440)

* EZP-30782: allow sorting by trashed field * EZP-30782: add table name * add unit test for new trashed field
gabrielfin · Aug 9, 2019 · 0a60562 · 0a60562
1 parent 0d8aebb
commit 0a60562
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/kernel/classes/ezcontentobjecttreenode.php b/kernel/classes/ezcontentobjecttreenode.php
@@ -652,6 +652,10 @@ static function createSortingSQLStrings( $sortList, $treeTableName = 'ezcontento
                         {
                             $sortingFields .= 'ezcontentobject_name.name';
                         } break;
+                        case 'trashed':
+                        {
+                            $sortingFields .= $treeTableName . '.trashed';
+                        } break;
                         case 'attribute':
                         {
                             $classAttributeID = $sortBy[2];

diff --git a/tests/tests/kernel/classes/ezcontentobjecttreenode_test2.php b/tests/tests/kernel/classes/ezcontentobjecttreenode_test2.php
@@ -60,4 +60,13 @@ public function testIssue23528( $name, $expected )
         $attributeFilter = eZContentObjectTreeNode::createAttributeFilterSQLStrings( $attributeFilterParams );
         $this->assertEquals( $expected, $attributeFilter['where'] );
     }
+
+    public function testSortingByTrashed()
+    {
+        // test sorting by trashed
+        $sortList = array( array( 'trashed', true ) );
+        $result = eZContentObjectTreeNode::createSortingSQLStrings( $sortList, 'ezcot' );
+        $this->assertEquals( 'ezcot.trashed asc',
+            strtolower( $result[ 'sortingFields' ] ) );
+    }
 }