Changeset 83385 in vbox for trunk

Timestamp:

Mar 24, 2020 2:46:13 PM (5 years ago)

Author:

vboxsync

Message:

TestManager/SchedQueue: Fixed various validation issues with the testbox-in-sched-group stuff. Added change log to the scheduling queue details page.

Location:

trunk/src/VBox/ValidationKit/testmanager/webui

Files:

• wuiadminschedgroup.py (modified) (1 diff)
• wuiadmintestbox.py (modified) (1 diff)
• wuihlpform.py (modified) (6 diffs)

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

@@ -86 +86 @@
         oForm.addListOfSchedGroupMembers(SchedGroupDataEx.ksParam_aoMembers,
                                          oData.aoMembers, self._aoAllRelevantTestGroups,    'Test groups',
-                                         fReadOnly = self._sMode == WuiFormContentBase.ksMode_Show);
+                                         oData.idSchedGroup, fReadOnly = self._sMode == WuiFormContentBase.ksMode_Show);
 
         oForm.addListOfSchedGroupBoxes(SchedGroupDataEx.ksParam_aoTestBoxes,
                                        oData.aoTestBoxes, self._aoAllRelevantTestBoxes,     'Test boxes',
-                                       fReadOnly = self._sMode == WuiFormContentBase.ksMode_Show);
+                                       oData.idSchedGroup, fReadOnly = self._sMode == WuiFormContentBase.ksMode_Show);
 
         oForm.addMultilineText(SchedGroupData.ksParam_sComment,     oData.sComment,         'Comment');

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

@@ -111 +111 @@
                                              oData.aoInSchedGroups,
                                              SchedGroupLogic(TMDatabaseConnection()).fetchOrderedByName(),
-                                             'Scheduling Group');
+                                             'Scheduling Group', oData.idTestBox);
         # Command, comment and submit button.
         if self._sMode == WuiFormContentBase.ksMode_Edit:

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

@@ -765 +765 @@
 
     def addListOfSchedGroupMembers(self, sName, aoSchedGroupMembers, aoAllRelevantTestGroups,  # pylint: disable=too-many-locals
-                                   sLabel, fReadOnly = True):
+                                   sLabel, idSchedGroup, fReadOnly = True):
         """
         For WuiAdminSchedGroup.
@@ -821 +821 @@
                       % ( 'tmodd' if iTestGroup & 1 else 'tmeven',
                           sPrefix, SchedGroupMemberData.ksParam_idTestGroup,    oTestGroup.idTestGroup,
-                          sPrefix, SchedGroupMemberData.ksParam_idSchedGroup,   -1 if oMember is None else oMember.idSchedGroup,
+                          sPrefix, SchedGroupMemberData.ksParam_idSchedGroup,   idSchedGroup,
                           sPrefix, SchedGroupMemberData.ksParam_tsExpire,       '' if oMember is None else oMember.tsExpire,
                           sPrefix, SchedGroupMemberData.ksParam_tsEffective,    '' if oMember is None else oMember.tsEffective,
@@ -863 +863 @@
                          u'</table>\n');
 
-    def addListOfSchedGroupBoxes(self, sName, aoSchedGroupBoxes, aoAllRelevantTestBoxes,  # pylint: disable=too-many-locals
-                                 sLabel, fReadOnly = True): # (str, list[TestBoxDataEx], list[TestBoxDataEx], str, bool) -> str
+    def addListOfSchedGroupBoxes(self, sName, aoSchedGroupBoxes, aoAllRelevantTestBoxes, sLabel, # pylint: disable=too-many-locals
+                                 idSchedGroup, fReadOnly = True): # (str, list[TestBoxDataEx], list[TestBoxDataEx], str, bool) -> str
         """
         For WuiAdminSchedGroup.
@@ -918 +918 @@
                       % ( 'tmodd' if iTestBox & 1 else 'tmeven',
                           sPrefix, TestBoxDataForSchedGroup.ksParam_idTestBox,    oTestBox.idTestBox,
-                          sPrefix, TestBoxDataForSchedGroup.ksParam_idSchedGroup, -1 if oMember is None else oMember.idSchedGroup,
+                          sPrefix, TestBoxDataForSchedGroup.ksParam_idSchedGroup, idSchedGroup,
                           sPrefix, TestBoxDataForSchedGroup.ksParam_tsExpire,     '' if oMember is None else oMember.tsExpire,
                           sPrefix, TestBoxDataForSchedGroup.ksParam_tsEffective,  '' if oMember is None else oMember.tsEffective,
@@ -940 +940 @@
 
     def addListOfSchedGroupsForTestBox(self, sName, aoInSchedGroups, aoAllSchedGroups, sLabel,  # pylint: disable=too-many-locals
-                                       fReadOnly = None):
+                                       idTestBox, fReadOnly = None):
         # type: (str, TestBoxInSchedGroupDataEx, SchedGroupData, str, bool) -> str
         """
@@ -1004 +1004 @@
                       u'    </td>\n'
                       % ( 'tmodd' if iSchedGroup & 1 else 'tmeven',
-                          sPrefix, TestBoxInSchedGroupData.ksParam_idSchedGroup,  oSchedGroup.idSchedGroup,
-                          sPrefix, TestBoxInSchedGroupData.ksParam_idTestBox,   -1 if oMember is None else oMember.idTestBox,
+                          sPrefix, TestBoxInSchedGroupData.ksParam_idSchedGroup, oSchedGroup.idSchedGroup,
+                          sPrefix, TestBoxInSchedGroupData.ksParam_idTestBox,   idTestBox,
                           sPrefix, TestBoxInSchedGroupData.ksParam_tsExpire,    '' if oMember is None else oMember.tsExpire,
                           sPrefix, TestBoxInSchedGroupData.ksParam_tsEffective, '' if oMember is None else oMember.tsEffective,