[Zope3-checkins] SVN: ldapauth/trunk/ Reflect changes form Zope3 branch roger-ldapauth

[Roger Ineichen]

Log message for revision 26410:
Reflect changes form Zope3 branch roger-ldapauth


-=-
Modified: ldapauth/trunk/__init__.py
===================================================================
--- ldapauth/trunk/__init__.py	2004-07-10 22:06:42 UTC (rev 26409)
+++ ldapauth/trunk/__init__.py	2004-07-10 22:29:40 UTC (rev 26410)
@@ -15,3 +15,4 @@
 
 $Id:
 """
+

Modified: ldapauth/trunk/browser/configure.zcml
===================================================================
--- ldapauth/trunk/browser/configure.zcml	2004-07-10 22:06:42 UTC (rev 26409)
+++ ldapauth/trunk/browser/configure.zcml	2004-07-10 22:29:40 UTC (rev 26410)
@@ -1,11 +1,11 @@
-<zope:configure
+<configure
     xmlns:zope="http://namespaces.zope.org/zope"
     xmlns="http://namespaces.zope.org/browser">
 
     <!-- LDAPPrincipalSource -->
     <addMenuItem
         title="Add LDAP Principal Source"
-        class="ldapauth.LDAPPrincipalSource"
+        class="ldapauth.source.LDAPPrincipalSource"
         permission="zope.ManageServices" />
 
     <addform
@@ -14,7 +14,9 @@
         name="AddLDAPPrincipalSourceForm" 
         permission="zope.ManageContent" />
 
-    <!-- provide a own Contents view without add and delete functions -->
+    <!-- provide a own Contents view without add and delete functions 
+         Perhaps we enhance this view later. At this time we use thos view
+         instead of the inherited Contents view from the ocntainer. -->
     <page
         for="ldapauth.interfaces.ILDAPBasedPrincipalSource"
         name="principals.html"
@@ -27,7 +29,8 @@
         schema="ldapauth.interfaces.ILDAPBasedPrincipalSource" 
         label="Edit LDAP-based Principal Source" 
         name="edit.html"        
-        menu="zmi_views" title="Edit" 
+        menu="zmi_views" title="Edit"
+        fields="host port basedn login_attribute manager_dn manager_passwd" 
         permission="zope.ManageContent" />
 
     <!-- connetion test view -->
@@ -41,4 +44,4 @@
 
 
 
-</zope:configure>
+</configure>

Modified: ldapauth/trunk/browser/principals.py
===================================================================
--- ldapauth/trunk/browser/principals.py	2004-07-10 22:06:42 UTC (rev 26409)
+++ ldapauth/trunk/browser/principals.py	2004-07-10 22:29:40 UTC (rev 26410)
@@ -45,3 +45,10 @@
         return principals
 
     principals = ViewPageTemplateFile('principals.pt')
+
+    def index(self):
+        if 'index.html' in self.context:
+            self.request.response.redirect('index.html')
+            return ''
+
+        return self._index()
\ No newline at end of file

Modified: ldapauth/trunk/configure.zcml
===================================================================
--- ldapauth/trunk/configure.zcml	2004-07-10 22:06:42 UTC (rev 26409)
+++ ldapauth/trunk/configure.zcml	2004-07-10 22:29:40 UTC (rev 26410)
@@ -7,7 +7,7 @@
 
     <content class=".LDAPPrincipalSource">
         <factory
-            id="zope.products.ldapauth.LDAPPrincipalSource"/>
+            id="ldapauth.source.LDAPPrincipalSource"/>
         <allow interface=".interfaces.ILDAPBasedPrincipalSource"/>
         <require
             permission="zope.ManageContent"

Modified: ldapauth/trunk/interfaces.py
===================================================================
--- ldapauth/trunk/interfaces.py	2004-07-10 22:06:42 UTC (rev 26409)
+++ ldapauth/trunk/interfaces.py	2004-07-10 22:29:40 UTC (rev 26410)
@@ -22,6 +22,7 @@
 
 class ILDAPBasedPrincipalSource(IPrincipalSource):
     """Describe LDAP-based authentication sources."""
+
     host = TextLine(
             title = _(u'Hostname'),
             description = _(u'LDAP Server location'),

Deleted: ldapauth/trunk/test_ldapsource.py
===================================================================

Deleted: ldapauth/trunk/tests/interfaces.py
===================================================================