Merged trunk to branch. I still ahve 4 ftests failing, but I suspect, it

will be fixed once I merge the changes of the last three days (hopefully).

authentication.py

@@ -89,7 +89,8 @@ def getPrincipal(self, id):
         id = id[len(self.prefix):]
 
         for searcher in self.searchers:
-            searcher = queryUtility(IPrincipalSearchPlugin, searcher)
+            searcher = queryUtility(IPrincipalSearchPlugin, searcher, 
+                                    context=self)
             if searcher is None:
                 continue
 
@@ -103,7 +104,10 @@ def getPrincipal(self, id):
 
     def getQueriables(self):
         for searcher_id in self.searchers:
-            searcher = queryUtility(IPrincipalSearchPlugin, searcher_id)
+            # ensure with context=self that we call it in the context if
+            # we call it form a PrincipalSource vocabulary
+            searcher = queryUtility(IPrincipalSearchPlugin, searcher_id, 
+                                    context=self)
             yield searcher_id, searcher
 
 

authenticationplugins.zcml

@@ -17,6 +17,10 @@
     <require
         permission="zope.ManageServices"
         interface="zope.app.container.interfaces.IContainer" />
+
+    <require
+        permission="zope.ManageServices"
+        attributes="prefix" />
 
   </localUtility>
 

browser/configure.zcml

@@ -58,6 +58,14 @@
       index="zope.ManageServices"
       />
 
+  <schemadisplay
+      schema="..principalfolder.IInternalPrincipalContainer"
+      label="Principal Folder Prefix"
+      name="prefix.html"
+      fields="prefix"
+      permission="zope.ManageServices"
+      menu="zmi_views" title="Prefix" />
+
   <editform
       schema="..httpplugins.IHTTPBasicAuthRealm"
       label="Change Realm"

browser/schemasearch.py

@@ -44,42 +44,59 @@ def render(self, name):
         html = []
 
         # add sub title for source search field
-        html.append('<h4 i18n:translate="">%s %s</h4>' % (sourcename, sourcepath))
+        html.append('<h4>%s</h4>' % sourcename)
+
+        # start row for path display field
+        html.append('<div class="row">')
+
+        # for each source add path of source
+        html.append('  <div class="label">')
+        label = _(u"Source path")
+        title = _(u"Path to the source utility")
+        html.append('    <label for="%s" title="%s">' % (sourcename, title))
+        html.append('      %s' % label)
+        html.append('    </label>')
+        html.append('  </div>')
+        html.append('  <div class="field">')
+        html.append('      %s' % sourcepath)
+        html.append('    </field>')
+        html.append('  </div>')
+        html.append('</div>')
+
         # start row for search fields
         html.append('<div class="row">')
 
         for field_name, field in getFieldsInOrder(schema):
             widget = getattr(self, field_name+'_widget')
 
             # for each field add lable...
-            html.append('<div class="label">')
-            html.append('<label for="%s" title="%s">'
+            html.append('  <div class="label">')
+            html.append('    <label for="%s" title="%s">'
                         % (widget.name, widget.hint))
-            html.append(widget.label)
-            html.append('</label>')
-            html.append('</div>')
+            html.append('      %s' % widget.label)
+            html.append('    </label>')
+            html.append('  </div>')
 
             # ...and field widget
-            html.append('<div class="field">')
-            html.append(widget())
+            html.append('  <div class="field">')
+            html.append('    %s' % widget())
 
             if widget.error():
-                html.append('<div class="error">')
-                html.append(widget.error())
-                html.append('</div>')
-            html.append('</div>')
+                html.append('    <div class="error">')
+                html.append('      %s' % widget.error())
+                html.append('    </div>')
+            html.append('  </div>')
         # end row
         html.append('</div>')
 
         # add search button for search fields
         html.append('<div class="row">')
-        html.append('<div class="field">')
-        html.append('<input type="submit" name="%s" value="%s" />'
+        html.append('  <div class="field">')
+        html.append('    <input type="submit" name="%s" value="%s" />'
                      % (name+'.search',
                         translate(search_label, context=self.request)))
+        html.append('  </div>')
         html.append('</div>')
-        html.append('</div>')
-
 
         return '\n'.join(html)
 

browser/schemasearch.txt

@@ -52,22 +52,33 @@ then we can get a view:
 This allows us to render a search form.
 
   >>> print view.render('test') # doctest: +NORMALIZE_WHITESPACE
-  <h4 i18n:translate="">searchplugin /searchplugin</h4>
+  <h4>searchplugin</h4>
   <div class="row">
-  <div class="label">
-  <label for="test.field.search" title="">
-  Search String
-  </label>
+    <div class="label">
+      <label for="searchplugin" title="Path to the source utility">
+        Source path
+      </label>
+    </div>
+    <div class="field">
+        /searchplugin
+      </field>
+    </div>
   </div>
-  <div class="field">
-  <input class="textType" id="test.field.search" name="test.field.search"
+  <div class="row">
+    <div class="label">
+      <label for="test.field.search" title="">
+        Search String
+      </label>
+    </div>
+    <div class="field">
+      <input class="textType" id="test.field.search" name="test.field.search"
          size="20" type="text" value=""  />
-  </div>
+    </div>
   </div>
   <div class="row">
-  <div class="field">
-  <input type="submit" name="test.search" value="Search" />
-  </div>
+    <div class="field">
+      <input type="submit" name="test.search" value="Search" />
+    </div>
   </div>
 
 If we ask for results: