merge

extra/modules/admin.ptl

@@ -103,6 +103,8 @@ class CollectivityUI:
                 value = self.collectivity.name)
         form.add(StringWidget, 'msp_tsid', title = _('MSP tsId'), required = False, size = 10,
                 value = self.collectivity.msp_tsid)
+        form.add(StringWidget, 'url_on_logout', title = _('URL on Logout'), required = False,
+                size = 30, value = self.collectivity.url_on_logout)
         form.add_submit('submit', _('Submit'))
         form.add_submit('cancel', _('Cancel'))
         return form
@@ -114,7 +116,7 @@ class CollectivityUI:
         return self.form()
 
     def submit_form(self, form):
-        for f in ('id', 'name', 'msp_tsid'):
+        for f in ('id', 'name', 'msp_tsid', 'url_on_logout'):
             if form.get_widget(f):
                 setattr(self.collectivity, f, form.get_widget(f).parse())
 

extra/modules/collectivity.py

@@ -8,4 +8,4 @@ class Collectivity(StorableObject):
     own_idp = None
     propose_msp = True
     msp_tsid = None
-
+    url_on_logout = None

extra/modules/root.ptl

@@ -1,7 +1,7 @@
 import lasso
 import Cookie
 
-from quixote import redirect, get_session, get_session_manager, get_response, get_field
+from quixote import redirect, get_session, get_session_manager, get_response, get_field, get_request
 from qommon import get_cfg, get_logger
 from qommon.form import *
 from qommon import template
@@ -506,7 +506,15 @@ class AlternateRootDirectory(OldRootDirectory):
                 # have been fixed if cap gemini described their actions...
                 pass
         get_session_manager().expire_session() 
-        return redirect('http://adeltest.servicepubliclocal.net/vandoeuvre/')
+        coll_id = get_request().get_header('X-Gdd-Account-Number')
+        if coll_id:
+            try:
+                coll = Collectivity.get(coll_id)
+                if coll.url_on_logout:
+                    return redirect(coll.url_on_logout)
+            except KeyError:
+                pass
+        return redirect('/')
 
     def register [html] (self):
         identities_cfg = get_cfg('identities', {})