Changeset 65423 in vbox for trunk/src/VBox

Timestamp:

Jan 24, 2017 2:40:08 PM (8 years ago)

Author:

vboxsync

Message:

WuiListContentBase: More testbox sorting (weekly meeting again).

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• core/testbox.py (modified) (2 diffs)
• webui/wuiadmintestbox.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testmanager/core/testbox.py

@@ -683 +683 @@
     kiSortColumn_iTestBoxScriptRev  = 11;
     kiSortColumn_iPythonHexVersion  = 12;
-    kcMaxSortColumns                = 13;
+    kiSortColumn_enmPendingCmd      = 13;
+    kiSortColumn_fEnabled           = 14;
+    kiSortColumn_enmState           = 15;
+    kiSortColumn_tsUpdated          = 16;
+    kcMaxSortColumns                = 17;
     kdSortColumnMap                 = {
         0:                               'TestBoxesWithStrings.sName',
@@ -710 +714 @@
         kiSortColumn_iPythonHexVersion:  'TestBoxesWithStrings.iPythonHexVersion',
         -kiSortColumn_iPythonHexVersion: 'TestBoxesWithStrings.iPythonHexVersion DESC',
+        kiSortColumn_enmPendingCmd:      'TestBoxesWithStrings.enmPendingCmd',
+        -kiSortColumn_enmPendingCmd:     'TestBoxesWithStrings.enmPendingCmd DESC',
+        kiSortColumn_fEnabled:           'TestBoxesWithStrings.fEnabled',
+        -kiSortColumn_fEnabled:          'TestBoxesWithStrings.fEnabled DESC',
+        kiSortColumn_enmState:           'TestBoxStatuses.enmState',
+        -kiSortColumn_enmState:          'TestBoxStatuses.enmState DESC',
+        kiSortColumn_tsUpdated:          'TestBoxStatuses.tsUpdated',
+        -kiSortColumn_tsUpdated:         'TestBoxStatuses.tsUpdated DESC',
     };
 

trunk/src/VBox/ValidationKit/testmanager/webui/wuiadmintestbox.py

@@ -196 +196 @@
             (TestBoxLogic.kiSortColumn_sName,),
             None, # LOM
-            None, # Status
-            None, # Cmd
+            (-TestBoxLogic.kiSortColumn_fEnabled, TestBoxLogic.kiSortColumn_enmState, -TestBoxLogic.kiSortColumn_tsUpdated,),
+            (TestBoxLogic.kiSortColumn_enmPendingCmd,),
             None, # Note
             (TestBoxLogic.kiSortColumn_iTestBoxScriptRev,),