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

Timestamp:

Mar 24, 2020 8:16:51 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

136614

Message:

TestManager/Wui: Filter out change log parameters for edit and clone links.

Location:

trunk/src/VBox/ValidationKit/testmanager/webui

Files:

• wuibase.py (modified) (1 diff)
• wuicontentbase.py (modified) (3 diffs)

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

@@ -97 +97 @@
     ## The name of the parameter indicate number of change log entries per page.
     ksParamChangeLogEntriesPerPage  = 'ChangeLogEntriesPerPage';
+    ## The change log related parameters.
+    kasChangeLogParams = (ksParamChangeLogEnabled, ksParamChangeLogPageNo, ksParamChangeLogEntriesPerPage,);
 
     ## @name Dispatcher debugging parameters.

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

@@ -663 +663 @@
         if self._sMode == self.ksMode_Show and self._fEditable:
             # Remove _idGen and effective date since we're always editing the current data,
-            # and make sure the primary ID is present.
+            # and make sure the primary ID is present.  Also remove change log stuff.
             dParams = self._oDisp.getParameters();
             if hasattr(oData, 'ksIdGenAttr'):
@@ -669 +669 @@
                 if sIdGenParam in dParams:
                     del dParams[sIdGenParam];
-            if WuiDispatcherBase.ksParamEffectiveDate in dParams:
-                del dParams[WuiDispatcherBase.ksParamEffectiveDate];
+            for sParam in [ WuiDispatcherBase.ksParamEffectiveDate, ] + list(WuiDispatcherBase.kasChangeLogParams):
+                if sParam in dParams:
+                    del dParams[sParam];
             dParams[getattr(oData, 'ksParam_' + oData.ksIdAttr)] = getattr(oData, oData.ksIdAttr);
 
@@ -676 +677 @@
             aoActions.append(WuiTmLink('Edit', '', dParams));
 
-            # Add clone operation if available. This uses the same data selection as for showing details.
+            # Add clone operation if available. This uses the same data selection as for showing details.  No change log.
             if hasattr(self._oDisp, self._sActionBase + 'Clone'):
                 dParams = self._oDisp.getParameters();
+                for sParam in WuiDispatcherBase.kasChangeLogParams:
+                    if sParam in dParams:
+                        del dParams[sParam];
                 dParams[WuiDispatcherBase.ksParamAction] = getattr(self._oDisp, self._sActionBase + 'Clone');
                 aoActions.append(WuiTmLink('Clone', '', dParams));