From 2d5c5cf66dc3c10cca2eceb008eedd12015f052c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Schneider?= <jschneider@entrouvert.com>
Date: Wed, 4 Jun 2014 11:36:09 +0200
Subject: [PATCH] rp_meyzieu: always remove stupid js alert about browser
 history

---
 rp_meyzieu/mappers/portail_famille_ecities.py | 63 ++++++++++---------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/rp_meyzieu/mappers/portail_famille_ecities.py b/rp_meyzieu/mappers/portail_famille_ecities.py
index 89eab6a..c642126 100644
--- a/rp_meyzieu/mappers/portail_famille_ecities.py
+++ b/rp_meyzieu/mappers/portail_famille_ecities.py
@@ -69,16 +69,20 @@ mapping = [
                 }]
             }, 
         {
-            'path': (r'/ffaxsslMeyzieu/$', r'/ffaxsslMeyzieu/workflow_url'),
+            'path': (r'/ffaxsslMeyzieu/$', r'/ffaxsslMeyzieu/workflow_url$'),
             'method': 'GET',
             'on_response': [{
                 'content-types': ['text/html'],
                 'filter': portail_famille_ecitiz.rewrite_logout_form
                 },
                 {
-                'content-types': ['text/html'],
-                'filter': portail_famille_ecitiz.add_sso_login_box
-                },
+                    'content-types': ['text/html'],
+                    'filter': portail_famille_ecitiz.add_sso_login_box
+                    },
+                {
+                    'content-types': ['text/html'],
+                    'filter': portail_famille_ecitiz.clean_js
+                    }
                 ],
             },
         {
@@ -91,34 +95,37 @@ mapping = [
                 ]
             },
         {
-            'path': r'/ffaxsslMeyzieu/mandaye_associate$',
-            'method': 'GET',
-            'target': '/ffaxsslMeyzieu/workflow_url?ECITIZ_ACTIVITY_PATH=Citoyen&ECITIZ_HOME_URL=citoyen.jsp&ECITIZ_PROCESS_ID=guichet&ECITIZ_DECONNECTION_URL=services_list.jsp&ECITIZ_ORG=MEY00',
-            'on_response': [{
-                'filter': portail_famille_ecitiz.associate,
-                'values': {
-                    'action': urls['associate_url'],
-                    'template': 'portail_famille/associate.html',
+                'path': r'/ffaxsslMeyzieu/mandaye_associate$',
+                'method': 'GET',
+                'target': '/ffaxsslMeyzieu/workflow_url?ECITIZ_ACTIVITY_PATH=Citoyen&ECITIZ_HOME_URL=citoyen.jsp&ECITIZ_PROCESS_ID=guichet&ECITIZ_DECONNECTION_URL=services_list.jsp&ECITIZ_ORG=MEY00',
+                'on_response': [{
+                    'filter': portail_famille_ecitiz.associate,
+                    'values': {
+                        'action': urls['associate_url'],
+                        'template': 'portail_famille/associate.html',
+                        },
                     },
+                    {
+                        'content-types': ['text/html'],
+                        'filter': portail_famille_ecitiz.clean_js
+                        }
+                    ]
                 },
-                {'filter': portail_famille_ecitiz.clean_js}
-                ]
-            },
         {
-            'path':  r'/ffaxsslMeyzieu/mandaye_associate$',
-            'method': 'POST',
-            'response': [
-                {
-                    'auth': 'associate_submit',
-                    'condition': "response.code==302"
-                    },
-                ]
-            },
+                'path':  r'/ffaxsslMeyzieu/mandaye_associate$',
+                'method': 'POST',
+                'response': [
+                    {
+                        'auth': 'associate_submit',
+                        'condition': "response.code==302"
+                        },
+                    ]
+                },
         {
-            'path': r'%s$' % END_POINTS_PATH['single_sign_on_post'],
-            'method': 'POST',
-            'response': [{'auth': 'single_sign_on_post'}]
-            },
+                'path': r'%s$' % END_POINTS_PATH['single_sign_on_post'],
+                'method': 'POST',
+                'response': [{'auth': 'single_sign_on_post'}]
+                },
         {
                 'path': r'%s$' % END_POINTS_PATH['single_logout'],
                 'method': 'GET',