Changeset 65039 in vbox

Timestamp:

Dec 30, 2016 3:35:30 PM (8 years ago)

Author:

vboxsync

Message:

testmanager: Simple system wide changelog.

Location:

trunk/src/VBox/ValidationKit/testmanager

Files:

• core/base.py (modified) (1 diff)
• core/systemchangelog.py (added)
• core/testbox.py (modified) (2 diffs)
• webui/wuiadmin.py (modified) (4 diffs)
• webui/wuiadminsystemchangelog.py (added)
• webui/wuicontentbase.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/testmanager/core/base.py

@@ -1299 +1299 @@
         self.sOldText       = sOldText;
 
+class AttributeChangeEntryPre(AttributeChangeEntry): # pylint: disable=R0903
+    """
+    AttributeChangeEntry for preformatted values.
+    """
+
+    def __init__(self, sAttr, oNewRaw, oOldRaw, sNewText, sOldText):
+        AttributeChangeEntry.__init__(self, sAttr, oNewRaw, oOldRaw, sNewText, sOldText);
+
 class ChangeLogEntry(object): # pylint: disable=R0903
     """

trunk/src/VBox/ValidationKit/testmanager/core/testbox.py

@@ -38 +38 @@
 from testmanager.core.base          import ModelDataBase, ModelDataBaseTestCase, ModelLogicBase, TMInFligthCollision, \
                                            TMInvalidData, TMTooManyRows, TMRowNotFound, \
-                                           ChangeLogEntry, AttributeChangeEntry;
+                                           ChangeLogEntry, AttributeChangeEntry, AttributeChangeEntryPre;
 from testmanager.core.useraccount   import UserAccountLogic;
 
@@ -749 +749 @@
                     oNewAttr = getattr(oNew, sAttr);
                     if oOldAttr != oNewAttr:
-                        aoChanges.append(AttributeChangeEntry(sAttr, oNewAttr, oOldAttr, str(oNewAttr), str(oOldAttr)));
+                        if sAttr == 'sReport':
+                            aoChanges.append(AttributeChangeEntryPre(sAttr, oNewAttr, oOldAttr, str(oNewAttr), str(oOldAttr)));
+                        else:
+                            aoChanges.append(AttributeChangeEntry(sAttr, oNewAttr, oOldAttr, str(oNewAttr), str(oOldAttr)));
             aoEntries.append(ChangeLogEntry(oNew.uidAuthor, None, oNew.tsEffective, oNew.tsExpire, oNew, oOld, aoChanges));
 

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

@@ -48 +48 @@
     ksScriptName = 'admin.py'
 
+    ## Number of days back.
+    ksParamDaysBack = 'cDaysBack';
 
     ## @name Actions
     ## @{
     ksActionSystemLogList           = 'SystemLogList'
+    ksActionSystemChangelogList     = 'SystemChangelogList'
 
     ksActionUserList                = 'UserList'
@@ -165 +168 @@
         #
         self._dDispatch[self.ksActionSystemLogList]             = self._actionSystemLogList;
+        self._dDispatch[self.ksActionSystemChangelogList]       = self._actionSystemChangelogList;
 
         #
@@ -333 +337 @@
             ],
             [
-                'System',      self._sActionUrlBase + self.ksActionSystemLogList,
+                'System',      self._sActionUrlBase + self.ksActionSystemChangelogList,
                 [
+                    [ 'Changelog',              self._sActionUrlBase + self.ksActionSystemChangelogList ],
                     [ 'System log',             self._sActionUrlBase + self.ksActionSystemLogList ],
                     [ 'User accounts',          self._sActionUrlBase + self.ksActionUserList ],
@@ -410 +415 @@
     #
 
+    # System wide changelog actions.
+
+    def _actionSystemChangelogList(self):
+        """ Action wrapper. """
+        from testmanager.core.systemchangelog          import SystemChangelogLogic;
+        from testmanager.webui.wuiadminsystemchangelog import WuiAdminSystemChangelogList;
+
+        tsEffective     = self.getEffectiveDateParam();
+        cItemsPerPage   = self.getIntParam(self.ksParamItemsPerPage, iMin = 2, iMax =   9999, iDefault = 300);
+        iPage           = self.getIntParam(self.ksParamPageNo,       iMin = 0, iMax = 999999, iDefault = 0);
+        cDaysBack       = self.getIntParam(self.ksParamDaysBack,     iMin = 1, iMax = 366,    iDefault = 14);
+        self._checkForUnknownParameters();
+
+        aoEntries  = SystemChangelogLogic(self._oDb).fetchForListingEx(iPage * cItemsPerPage, cItemsPerPage + 1,
+                                                                       tsEffective, cDaysBack);
+        oContent   = WuiAdminSystemChangelogList(aoEntries, iPage, cItemsPerPage, tsEffective,
+                                                 cDaysBack = cDaysBack, fnDPrint = self._oSrvGlue.dprint, oDisp = self);
+        (self._sPageTitle, self._sPageBody) = oContent.show();
+        return True;
+
     # System Log actions.
 

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

@@ -36 +36 @@
 from common                         import webutils;
 from testmanager                    import config;
-from testmanager.webui.wuibase      import WuiDispatcherBase, WuiException
+from testmanager.webui.wuibase      import WuiDispatcherBase, WuiException;
 from testmanager.webui.wuihlpform   import WuiHlpForm;
 from testmanager.core               import db;
+from testmanager.core.base          import AttributeChangeEntryPre;
 
 
@@ -460 +461 @@
         j = 0;
         for oChange in oEntry.aoChanges:
-            sContent += '        <tr class="%s%s"><td>%s</td><td>%s</td><td>%s</td></tr>\n' \
-                      % ( sRowClass, 'odd' if j & 1 else 'even',
-                          webutils.escapeElem(oChange.sAttr),
-                          webutils.escapeElem(oChange.sOldText),
-                          webutils.escapeElem(oChange.sNewText), );
+            if isinstance(oChange, AttributeChangeEntryPre):
+                sContent += '        <tr class="%s%s"><td>%s</td>'\
+                            '<td><div class="tdpre"><pre>%s</pre></div></td>' \
+                            '<td><div class="tdpre"><pre>%s</pre></div></td></tr>\n' \
+                          % ( sRowClass, 'odd' if j & 1 else 'even',
+                              webutils.escapeElem(oChange.sAttr),
+                              webutils.escapeElem(oChange.sOldText),
+                              webutils.escapeElem(oChange.sNewText), );
+            else:
+                sContent += '        <tr class="%s%s"><td>%s</td><td>%s</td><td>%s</td></tr>\n' \
+                          % ( sRowClass, 'odd' if j & 1 else 'even',
+                              webutils.escapeElem(oChange.sAttr),
+                              webutils.escapeElem(oChange.sOldText),
+                              webutils.escapeElem(oChange.sNewText), );
             j += 1;