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

Timestamp:

Jan 3, 2017 1:26:56 PM (8 years ago)

Author:

vboxsync

Message:

TestManager: always display some of the filter critera.

File:

• trunk/src/VBox/ValidationKit/testmanager/webui/wuimain.py (modified) (3 diffs)

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

@@ -894 +894 @@
         # Now, generate a filter control panel for the side bar.
         #
+        if hasattr(oFilter, 'kiBranches'):
+            oFilter.aCriteria[oFilter.kiBranches].fExpanded = True;
+        if hasattr(oFilter, 'kiTestStatus'):
+            oFilter.aCriteria[oFilter.kiTestStatus].fExpanded = True;
         self._sPageFilter = self._generateResultFilter(oFilter, oResultLogic, tsEffective, sCurPeriod,
                                                        enmResultsGroupingType = enmResultsGroupingType,
@@ -929 +933 @@
         for oCrit in oFilter.aCriteria:
             if len(oCrit.aoPossible) > 0:
-                sClass = 'sf-collapsable' if oCrit.sState == oCrit.ksState_Selected else 'sf-expandable';
-                sChar  = '▼'        if oCrit.sState == oCrit.ksState_Selected else '▶';
+                if   oCrit.sState == oCrit.ksState_Selected \
+                  or len(oCrit.aoPossible) <= 2 \
+                  or oCrit.fExpanded is True:
+                    sClass = 'sf-collapsable';
+                    sChar  = '&#9660;';
+                else:
+                    sClass = 'sf-expandable';
+                    sChar  = '&#9654;';
+
                 sHtml += u'  <dt class="%s"><a href="javascript:void(0)" onclick="toggleCollapsableDtDd(this);">%s'\
                          u' %s</a></dt>\n' \
@@ -1230 +1241 @@
         self._sPageBody = sNavi + self._sPageBody;
 
+        if hasattr(oFilter, 'kiBranches'):
+            oFilter.aCriteria[oFilter.kiBranches].fExpanded = True;
         self._sPageFilter = self._generateResultFilter(oFilter, oModel, tsEffective, '%s hours' % (cHoursPerPeriod * cPeriods,));
         return True;