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

Timestamp:

Jun 3, 2016 2:22:30 AM (9 years ago)

Author:

vboxsync

Message:

vsheriff: Some progress.

Location:

trunk/src/VBox/ValidationKit/testmanager/webui

Files:

• wuiadmin.py (modified) (1 diff)
• wuibase.py (modified) (1 diff)
• wuicontentbase.py (modified) (1 diff)
• wuimain.py (modified) (3 diffs)
• wuitestresult.py (modified) (4 diffs)

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

@@ -405 +405 @@
         return False
 
-    def _actionGenericDoRemove(self, oLogicType, sParamId, sRedirAction):
-        """
-        Delete entry (using oLogicType.removeEntry).
-
-        oLogicType is a class that implements addEntry.
-
-        sParamId is the name (ksParam_...) of the HTTP variable hold the ID of
-        the database entry to delete.
-
-        sRedirAction is what action to redirect to on success.
-        """
-        idEntry = self.getIntParam(sParamId, iMin = 1, iMax = 0x7fffffe)
-        fCascade = self.getBoolParam('fCascadeDelete', False);
-        self._checkForUnknownParameters()
-
-        try:
-            self._sPageTitle  = None
-            self._sPageBody   = None
-            self._sRedirectTo = self._sActionUrlBase + sRedirAction;
-            return oLogicType(self._oDb).removeEntry(self._oCurUser.uid, idEntry, fCascade = fCascade, fCommit = True);
-        except Exception as oXcpt:
-            self._oDb.rollback();
-            self._sPageTitle  = 'Unable to delete entry';
-            self._sPageBody   = str(oXcpt);
-            if config.g_kfDebugDbXcpt:
-                self._sPageBody += cgitb.html(sys.exc_info());
-            self._sRedirectTo = None;
-        return False;
-
 
     #

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

@@ -822 +822 @@
         return True
 
+    def _actionGenericDoRemove(self, oLogicType, sParamId, sRedirAction):
+        """
+        Delete entry (using oLogicType.removeEntry).
+
+        oLogicType is a class that implements addEntry.
+
+        sParamId is the name (ksParam_...) of the HTTP variable hold the ID of
+        the database entry to delete.
+
+        sRedirAction is what action to redirect to on success.
+        """
+        idEntry = self.getIntParam(sParamId, iMin = 1, iMax = 0x7ffffffe)
+        fCascade = self.getBoolParam('fCascadeDelete', False);
+        self._checkForUnknownParameters()
+
+        try:
+            self._sPageTitle  = None
+            self._sPageBody   = None
+            self._sRedirectTo = self._sActionUrlBase + sRedirAction;
+            return oLogicType(self._oDb).removeEntry(self._oCurUser.uid, idEntry, fCascade = fCascade, fCommit = True);
+        except Exception as oXcpt:
+            self._oDb.rollback();
+            self._sPageTitle  = 'Unable to delete entry';
+            self._sPageBody   = str(oXcpt);
+            if config.g_kfDebugDbXcpt:
+                self._sPageBody += cgitb.html(sys.exc_info());
+            self._sRedirectTo = None;
+        return False;
 
     def _actionGenericFormEdit(self, oDataType, oFormType, sIdParamName = None, sRedirectTo = None):

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

@@ -606 +606 @@
             aoActions.append(WuiTmLink('Details', '', dParams));
 
+            # Add delete operation if available.
+            if hasattr(self._oDisp, self._sActionBase + 'DoRemove'):
+                dParams = self._oDisp.getParameters();
+                dParams[WuiDispatcherBase.ksParamAction] = getattr(self._oDisp, self._sActionBase + 'DoRemove');
+                dParams[getattr(oData, 'ksParam_' + oData.ksIdAttr)] = getattr(oData, oData.ksIdAttr);
+                aoActions.append(WuiTmLink('Delete', '', dParams, sConfirm = "Are you absolutely sure?"));
+
         return aoActions;
 

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

@@ -68 +68 @@
     ksActionTestResultFailureEdit       = 'TestResultFailureEdit'
     ksActionTestResultFailureEditPost   = 'TestResultFailureEditPost'
+    ksActionTestResultFailureDoRemove   = 'TestResultFailureDoRemove'
     ksActionViewLog                     = 'ViewLog'
     ksActionGetFile                     = 'GetFile'
@@ -208 +209 @@
         self._dDispatch[self.ksActionTestResultFailureAddPost]      = self._actionTestResultFailureAddPost;
         self._dDispatch[self.ksActionTestResultFailureDetails]      = self._actionTestResultFailureDetails;
+        self._dDispatch[self.ksActionTestResultFailureDoRemove]     = self._actionTestResultFailureDoRemove;
         self._dDispatch[self.ksActionTestResultFailureEdit]         = self._actionTestResultFailureEdit;
         self._dDispatch[self.ksActionTestResultFailureEditPost]     = self._actionTestResultFailureEditPost;
@@ -969 +971 @@
                                               WuiTestResultFailure, self.ksActionResultsUnGrouped);
 
+    def _actionTestResultFailureDoRemove(self):
+        """ Action wrapper. """
+        from testmanager.core.testresultfailures import TestResultFailureData, TestResultFailureLogic;
+        from testmanager.webui.wuitestresultfailure import WuiTestResultFailure;
+        return self._actionGenericDoRemove(TestResultFailureLogic, TestResultFailureData.ksParam_idTestResult,
+                                           self.ksActionResultsUnGrouped);
+
     def _actionTestResultFailureDetails(self):
         """ Pro forma. """

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

@@ -182 +182 @@
             if oTestResult.tsElapsed is not None:
                 tsEvent += oTestResult.tsElapsed;
-            sHtml  = ' <tr class="%s tmtbl-events-leaf tmtbl-events-lvl%s tmstatusrow-%s">\n' \
-                     '  <td>%s</td>\n' \
+            sHtml  = ' <tr class="%s tmtbl-events-leaf tmtbl-events-lvl%s tmstatusrow-%s" id="S%u">\n' \
+                     '  <td id="E%u">%s</td>\n' \
                      '  <td>%s</td>\n' \
                      '  <td>%s</td>\n' \
@@ -190 +190 @@
                      '  <td>%s</td>\n' \
                      ' </tr>\n' \
-                   % ( 'tmodd' if iRow & 1 else 'tmeven', iDepth, oTestResult.enmStatus,
-                       webutils.escapeElem(self.formatTsShort(tsEvent)),
+                   % ( 'tmodd' if iRow & 1 else 'tmeven', iDepth, oTestResult.enmStatus, oTestResult.idTestResult,
+                       oTestResult.idTestResult, webutils.escapeElem(self.formatTsShort(tsEvent)),
                        sElapsedGraph,
                        webutils.escapeElem(self.formatIntervalShort(oTestResult.tsElapsed)) if oTestResult.tsElapsed is not None
@@ -307 +307 @@
             # Done?
             if oTestResult.tsElapsed is not None:
-                sHtml += ' <tr class="%s tmtbl-events-final tmtbl-events-lvl%s tmstatusrow-%s">\n' \
+                sHtml += ' <tr class="%s tmtbl-events-final tmtbl-events-lvl%s tmstatusrow-%s" id="E%d">\n' \
                          '  <td>%s</td>\n' \
                          '  <td>%s</td>\n' \
@@ -315 +315 @@
                          '  <td>%s</td>\n' \
                          ' </tr>\n' \
-                       % ( 'tmodd' if iRow & 1 else 'tmeven', iDepth, oTestResult.enmStatus,
+                       % ( 'tmodd' if iRow & 1 else 'tmeven', iDepth, oTestResult.enmStatus, oTestResult.idTestResult,
                            webutils.escapeElem(self.formatTsShort(oTestResult.tsCreated + oTestResult.tsElapsed)),
                            sElapsedGraph,