Changeset 61592 in vbox for trunk/src/VBox/ValidationKit/testmanager/webui

Timestamp:

Jun 8, 2016 8:10:20 PM (9 years ago)

Author:

vboxsync

Message:

testmanager: attempt to fix broken testbox list actions. unfortuantely, the scheduling group migration had to go since it's now ambigious wrt multiple scheduling group participation of testboxes.

Location:

trunk/src/VBox/ValidationKit/testmanager/webui

Files:

• wuiadmin.py (modified) (1 diff)
• wuiadmintestbox.py (modified) (1 diff)

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

@@ -506 +506 @@
                         oTestBox.fEnabled = fEnable;
                         oLogic.editEntry(oTestBox, self._oCurUser.uid, fCommit = False);
-            elif sListAction == 'setgroup':
-                for oTestBox in aoTestBoxes:
-                    if oTestBox.idSchedGroup != idAction:
-                        oTestBox.idSchedGroup = idAction;
-                        oLogic.editEntry(oTestBox, self._oCurUser.uid, fCommit = False);
             else:
                 for oTestBox in aoTestBoxes:
                     if oTestBox.enmPendingCmd != sListAction:
-                        oTestBox.enmPendingCmd = sListAction;
-                        oLogic.editEntry(oTestBox, self._oCurUser.uid, fCommit = False);
+                        oLogic.setCommand(idTestBox, oTestBox.enmPendingCmd, sListAction, self._oCurUser.uid, fCommit = False);
             self._oDb.commit();
 

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

@@ -190 +190 @@
                                        'align="center"' ]);
         self._aoActions     = list(self.kasTestBoxActionDescs);
-        self._aoSchedGroups = SchedGroupLogic(self._oDisp.getDb()).fetchOrderedByName();
-        self._dSchedGroups  = dict();
-        for oSchedGroup in self._aoSchedGroups:
-            self._aoActions.append([ 'setgroup-%u' % (oSchedGroup.idSchedGroup,),
-                                     'Migrate to group %s (#%u)' % (oSchedGroup.sName, oSchedGroup.idSchedGroup,),
-                                     oSchedGroup.sDescription ]);
-            self._dSchedGroups[oSchedGroup.idSchedGroup] = oSchedGroup;
         self._sAction       = oDisp.ksActionTestBoxListPost;
         self._sCheckboxName = TestBoxData.ksParam_idTestBox;