disable disassociation filters for espace famille and duonet

mandaye_vincennes/filters/vincennes.py

@@ -168,25 +168,6 @@ class EspaceFamille:
                 logger.warning('Filter EspaceFamille.resp_associate failed !')
         return response
 
-    def resp_disassociate(self, env, values, resquest, response):
-        """ Add a disassociation link
-        """
-        if response.msg and\
-                '<!-- Navigation -->' in response.msg:
-            login = env['beaker.session'].get('unique_id')
-            current_account = get_current_account(env, values)
-            if login and current_account:
-                disassociate = serve_template('famille/disassociate.html',
-                        'iso8859-15',
-                        account=current_account, **values)
-                sub = re.subn(r'(connexion" /></p>)',
-                        r"\1%s" % disassociate, response.msg)
-                response.msg = sub[0]
-                if sub[1] > 1:
-                    logger.warning('Filter EspaceFamille.disassociate failed !')
-        return response
-
-
 class Duonet:
 
     def resp_login_page(self, env, values, request, response):
@@ -220,23 +201,14 @@ class Duonet:
         return response
 
     def resp_global_html(self, env, values, request, response):
-        """ Modify response html to support disassociation and link to federate an account
+        """ Modify response html to add a link to federate an account
         """
         if response.msg \
                 and 'font-weight:bold;">Conservatoire de Vincennes' in response.msg:
             login = env['beaker.session'].get('unique_id')
             site_name = values.get('site_name')
             current_account = get_current_account(env, values)
-            if login and current_account and 'ctl00_lnkDisconnect' in response.msg:
-                disassociate = serve_template('duonet/disassociate.html',
-                        'iso8859-15',
-                        account=current_account, **values)
-                document = lxml.html.fromstring(response.msg.decode('utf8'))
-                a = document.get_element_by_id('ctl00_lnkDisconnect')
-                new_element = lxml.html.fromstring(disassociate)
-                a.addprevious(new_element)
-                response.msg = lxml.html.tostring(document, encoding='utf8')
-            elif 'ctl00_chpMain_newsfeed_pnlBorder' in response.msg:
+            if not login and 'ctl00_chpMain_newsfeed_pnlBorder' in response.msg:
                 template = serve_template(values.get('nosso_template'),
                         'iso8859-15',
                         **values)
@@ -246,16 +218,3 @@ class Duonet:
                 div.addnext(new_element)
                 response.msg = lxml.html.tostring(document, encoding='utf8')
         return response
-
-    def logout(self, env, values, request, response):
-        for cookie in request.cookies.itervalues():
-            cookie['expires'] = 'Tue, 02-Dec-2003 08:19:12 GMT'
-            cookie['Path'] = '/'
-        logger.debug('Logout from Mandaye')
-        env['beaker.session'].delete()
-        return _302(values.get('index_url'), request.cookies)
-
-
-
-
-

mandaye_vincennes/mappers/famille_vincennes.py

@@ -27,17 +27,6 @@ mapping = [
             'method': 'GET',
             'redirect': '%s/affichage_accueil_prive.do' % folder_target
             },
-        {
-            'path': r'/(?!/*mandaye|.*/associate)',
-            'method': 'GET',
-            'on_response': [
-                {
-                    'filter': filters.resp_disassociate,
-                    'content-types': ['text/html'],
-                    'values': {'site_name': 'espace_famille'}
-                    },
-                ]
-            },
         {
             'path': r"/(?!.*/associate)",
             'on_response': [{