summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérôme Schneider <jschneider@entrouvert.com>2014-06-04 09:40:22 (GMT)
committerJérôme Schneider <jschneider@entrouvert.com>2014-06-04 09:40:22 (GMT)
commit6c0eb386ac6c6c038fc446fc1017c02417a819d5 (patch)
tree934ffa2f19e35120170c77e9718a1698baf935c6
parent2d5c5cf66dc3c10cca2eceb008eedd12015f052c (diff)
downloadmandaye-meyzieu-6c0eb386ac6c6c038fc446fc1017c02417a819d5.zip
mandaye-meyzieu-6c0eb386ac6c6c038fc446fc1017c02417a819d5.tar.gz
mandaye-meyzieu-6c0eb386ac6c6c038fc446fc1017c02417a819d5.tar.bz2
Revert "rp_meyzieu: always remove stupid js alert about browser history"
This reverts commit 2d5c5cf66dc3c10cca2eceb008eedd12015f052c.
-rw-r--r--rp_meyzieu/mappers/portail_famille_ecities.py63
1 files changed, 28 insertions, 35 deletions
diff --git a/rp_meyzieu/mappers/portail_famille_ecities.py b/rp_meyzieu/mappers/portail_famille_ecities.py
index c642126..89eab6a 100644
--- a/rp_meyzieu/mappers/portail_famille_ecities.py
+++ b/rp_meyzieu/mappers/portail_famille_ecities.py
@@ -69,20 +69,16 @@ 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.clean_js
- }
+ 'content-types': ['text/html'],
+ 'filter': portail_famille_ecitiz.add_sso_login_box
+ },
],
},
{
@@ -95,37 +91,34 @@ 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',