[Checkins] SVN: GenericSetup/branches/tseaver-bbq_sprint/ - Fix error case, results report.

[Tres Seaver]

Log message for revision 73226:
   - Fix error case, results report.

Changed:
  U   GenericSetup/branches/tseaver-bbq_sprint/CHANGES.txt
  U   GenericSetup/branches/tseaver-bbq_sprint/tool.py
  U   GenericSetup/branches/tseaver-bbq_sprint/www/sutImportSteps.zpt

-=-
Modified: GenericSetup/branches/tseaver-bbq_sprint/CHANGES.txt
===================================================================
--- GenericSetup/branches/tseaver-bbq_sprint/CHANGES.txt	2007-03-16 17:58:13 UTC (rev 73225)
+++ GenericSetup/branches/tseaver-bbq_sprint/CHANGES.txt	2007-03-16 18:04:59 UTC (rev 73226)
@@ -2,6 +2,16 @@
 
   GenericSetup 1.3-beta (unreleased)
 
+    - Removed the 'create_report' decoy in the ZMI view methods:  there was
+      never any UI for passing any value other than the default, anyway, and
+      the report objects are too useful to omit.
+
+    - Refactored the "Properties" tab to separate baseline profiles from
+      extension profiles, marking the option to reset the baseline as
+      potentially dangerous for sites which already have one.  Allow
+      importing one or more extension profiles directly (all steps) from the 
+      "Properties" tab.
+
     - No longer read the toolset xml and update the toolset regustry on
       import context change.  Doing this only during the toolset step import
       should be sufficient.

Modified: GenericSetup/branches/tseaver-bbq_sprint/tool.py
===================================================================
--- GenericSetup/branches/tseaver-bbq_sprint/tool.py	2007-03-16 17:58:13 UTC (rev 73225)
+++ GenericSetup/branches/tseaver-bbq_sprint/tool.py	2007-03-16 18:04:59 UTC (rev 73226)
@@ -416,12 +416,7 @@
     manage_importSteps = PageTemplateFile('sutImportSteps', _wwwdir)
 
     security.declareProtected(ManagePortal, 'manage_importSelectedSteps')
-    def manage_importSelectedSteps(self,
-                                   ids,
-                                   run_dependencies,
-                                   RESPONSE,
-                                   create_report=True,
-                                  ):
+    def manage_importSelectedSteps(self, ids, run_dependencies):
         """ Import the steps selected by the user.
         """
         messages = {}
@@ -437,53 +432,54 @@
 
             summary = 'Steps run: %s' % ', '.join(steps_run)
 
-            if create_report:
-                name = self._mangleTimestampName('import-selected', 'log')
-                self._createReport(name, result['steps'], result['messages'])
+            name = self._mangleTimestampName('import-selected', 'log')
+            self._createReport(name, result['steps'], result['messages'])
 
         return self.manage_importSteps(manage_tabs_message=summary,
                                        messages=messages)
 
     security.declareProtected(ManagePortal, 'manage_importSelectedSteps')
-    def manage_importAllSteps(self, RESPONSE, create_report=True):
+    def manage_importAllSteps(self):
 
         """ Import all steps.
         """
         result = self.runAllImportSteps()
         steps_run = 'Steps run: %s' % ', '.join(result['steps'])
 
-        if create_report:
-            name = self._mangleTimestampName('import-all', 'log')
-            self._createReport(name, result['steps'], result['messages'])
+        name = self._mangleTimestampName('import-all', 'log')
+        self._createReport(name, result['steps'], result['messages'])
 
         return self.manage_importSteps(manage_tabs_message=steps_run,
                                        messages=result['messages'])
 
     security.declareProtected(ManagePortal, 'manage_importExtensions')
-    def manage_importExtensions(self, profile_ids, RESPONSE,
-                                create_report=True):
+    def manage_importExtensions(self, RESPONSE, profile_ids=()):
 
         """ Import all steps for the selected extension profiles.
         """
+        detail = {}
         if len(profile_ids) == 0:
             message = 'Please select one or more extension profiles.'
+            RESPONSE.redirect('%s/manage_tool?manage_tabs_message=%s'
+                                  % (self.absolute_url(), message))
         else:
             message = 'Imported profiles: %s' % ', '.join(profile_ids)
         
-        for profile_id in profile_ids:
+            for profile_id in profile_ids:
 
-            result = self.runAllImportStepsFromProfile(profile_id)
+                result = self.runAllImportStepsFromProfile(profile_id)
 
-            if create_report:
                 prefix = 'import-all-%s' % profile_id.replace(':', '_')
                 name = self._mangleTimestampName(prefix, 'log')
                 self._createReport(name, result['steps'], result['messages'])
+                for k, v in result['messages'].items():
+                    detail['%s:%s' % (profile_id, k)] = v
 
-        return self.manage_importSteps(manage_tabs_message=message,
-                                       messages=result['messages'])
+            return self.manage_importSteps(manage_tabs_message=message,
+                                        messages=detail)
 
     security.declareProtected(ManagePortal, 'manage_importTarball')
-    def manage_importTarball(self, tarball, RESPONSE, create_report=True):
+    def manage_importTarball(self, tarball):
         """ Import steps from the uploaded tarball.
         """
         if getattr(tarball, 'read', None) is not None:
@@ -498,9 +494,8 @@
                                                  purge_old=True)
         steps_run = 'Steps run: %s' % ', '.join(result['steps'])
 
-        if create_report:
-            name = self._mangleTimestampName('import-all', 'log')
-            self._createReport(name, result['steps'], result['messages'])
+        name = self._mangleTimestampName('import-all', 'log')
+        self._createReport(name, result['steps'], result['messages'])
 
         return self.manage_importSteps(manage_tabs_message=steps_run,
                                        messages=result['messages'])

Modified: GenericSetup/branches/tseaver-bbq_sprint/www/sutImportSteps.zpt
===================================================================
--- GenericSetup/branches/tseaver-bbq_sprint/www/sutImportSteps.zpt	2007-03-16 17:58:13 UTC (rev 73225)
+++ GenericSetup/branches/tseaver-bbq_sprint/www/sutImportSteps.zpt	2007-03-16 18:04:59 UTC (rev 73226)
@@ -79,11 +79,15 @@
    </td>
   </tr>
  </tbody>
+</table>
 
- <tbody tal:condition="options/messages | nothing">
+<table cellspacing="0" cellpadding="4"
+       tal:condition="options/messages | nothing">
+
   <tr class="list-header">
    <td colspan="4">Message Log</td>
   </tr>
+
   <tr valign="top"
       tal:repeat="item options/messages/items">
    <td tal:content="python: item[0]">STEP</td>
@@ -91,7 +95,6 @@
        tal:content="structure python: item[1].replace('\n', '<br />')"
        >MESSAGE</td>
   </tr>
- </tbody>
 
 </table>
 </form>