[KSS-checkins] r50494 - kukit/kss.demo/branch/improve-demos/kss/demo/browser

[gotcha at codespeak.net]

Author: gotcha
Date: Thu Jan 10 18:47:51 2008
New Revision: 50494

Modified:
   kukit/kss.demo/branch/improve-demos/kss/demo/browser/configure.zcml
   kukit/kss.demo/branch/improve-demos/kss/demo/browser/kss_demo_index.pt
   kukit/kss.demo/branch/improve-demos/kss/demo/browser/registry.py
Log:
search and find zuite object

Modified: kukit/kss.demo/branch/improve-demos/kss/demo/browser/configure.zcml
==============================================================================
--- kukit/kss.demo/branch/improve-demos/kss/demo/browser/configure.zcml	(original)
+++ kukit/kss.demo/branch/improve-demos/kss/demo/browser/configure.zcml	Thu Jan 10 18:47:51 2008
@@ -58,7 +58,7 @@
     for="kss.demo.interfaces.ISimpleContent"
     name="kss_demo_registry"
     class=".registry.KSSDemoRegistryView"
-    allowed_attributes="getSortedDemos getDemoGroups getSeleniumTests"
+    allowed_attributes="getSortedDemos getDemoGroups getSeleniumTests getZuite"
     permission="zope.View"
     />
   <page

Modified: kukit/kss.demo/branch/improve-demos/kss/demo/browser/kss_demo_index.pt
==============================================================================
--- kukit/kss.demo/branch/improve-demos/kss/demo/browser/kss_demo_index.pt	(original)
+++ kukit/kss.demo/branch/improve-demos/kss/demo/browser/kss_demo_index.pt	Thu Jan 10 18:47:51 2008
@@ -7,19 +7,12 @@
     <h1>KSS demos</h1>
     <p metal:use-macro="context/@@body_macros/kss_mode">Kss mode</p>
     <h2>Tests</h2>
-    <ul style="background-color:#E0E0C0;">
-     <li><a href="@@kukittestsuite">Run all ECMA unittests</a></li>
-     <li>Link to Zelenium object:
-       <form tal:attributes="action string:${context/absolute_url}/zuite.html">
-          <input type="text" name="path" value="zuite" />
-          <input type="submit" name="submit" value="Run all Selenium tests" />
-       </form>
-      </li>
+    <ul>
+     <li><a href="@@kukittestsuite">ECMA unittests</a></li>
+     <li tal:condition="context/@@kss_demo_registry/getZuite">
+       <a tal:attributes="href string:${context/absolute_url}/zuite.html">
+          Selenium tests runner</a></li>
     </ul>
-    <p class="help">
-      Zelenium object link must be an absolute path from the domain root, 
-      or a relative path from the demo SimpleContent's parent.
-    </p>
       <tal:groups repeat="demo_group context/@@kss_demo_registry/getDemoGroups">
         <tal:plugin condition="python:demo_group['is_first_plugin_namespace'] and demo_group['plugin_namespace']==''">
              <h2>Core plugin</h2>

Modified: kukit/kss.demo/branch/improve-demos/kss/demo/browser/registry.py
==============================================================================
--- kukit/kss.demo/branch/improve-demos/kss/demo/browser/registry.py	(original)
+++ kukit/kss.demo/branch/improve-demos/kss/demo/browser/registry.py	Thu Jan 10 18:47:51 2008
@@ -107,12 +107,22 @@
         self.request.response.setHeader('Content-type', 'text/html;charset=utf-8')
         return file(filename).read()
 
-    def getZuiteHomePage(self, path):
+    def getZuiteHomePage(self):
         """Redirects to the Zuite home page, Zuite object is found from path."""
-        zuite = self.context.aq_inner.aq_parent.restrictedTraverse(path)
+        zuite = self.getZuite()
         html = "%s/core/TestRunner.html?test=%s/suite.html" % (zuite.absolute_url(), self.context.absolute_url())
         return self.request.response.redirect(html)
 
+    def getZuite(self):
+        """Finds a zuite in the same directory or under"""
+        if not hasattr(self, 'zuites'):
+            container = self.context.aq_inner.aq_parent
+            self.zuites = self.context.ZopeFind(container, obj_metatypes=['Zuite'], search_sub=1)
+        if self.zuites:
+            return self.zuites[0][1]
+        else:
+            return None
+
 class KSSDemoRegistryAdminView(BrowserView):
     """Things that only admin should do"""
     implements(IBrowserPublisher)