Mercurial Mercurial > platform / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
virtualenv/web/res/patch/social_auth_views_diff.diff
author grandjoncl
Thu, 11 Oct 2012 16:39:05 +0200
changeset 842 ca38abd140b3
parent 57 795f01224eef
permissions -rw-r--r--
Corrections of the code for the embed popup. Functions are now in the embed_popup.js With chrome the player used to play the video even when it wasn't supposed to be displayed and kept playing when we hid the player. When we changed between div and iframe the player started even when it was suppose to be hidden. It's now solved.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
57
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
     1
 
--- D:/CavalieT/My Documents/Flex Builder 3/platform_diane/platform/virtualenv/web/res/src/omab-django-social-auth-v0.3.8-9-g5d610a5/omab-django-social-auth-5d610a5/social_auth/views.py	lun. mars 28 12:03:45 2011
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
     2
 
+++ D:/CavalieT/My Documents/Flex Builder 3/platform_diane/platform/virtualenv/web/env/myplatformenv/Lib/site-packages/django_social_auth-0.3.8-py2.6.egg/social_auth/views.py	ven. avr.  8 12:06:02 2011
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
     3
 
@@ -7,13 +7,27 @@
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
     4
 
 from django.contrib.auth import login, REDIRECT_FIELD_NAME
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
     5
 
 from django.contrib.auth.decorators import login_required
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
     6
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
     7
 
-from social_auth.backends import get_backend
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
     8
 
+from social_auth.backends import get_backend, get_backends
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
     9
 
 from social_auth.utils import sanitize_redirect
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    10
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    11
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    12
 
 DEFAULT_REDIRECT = getattr(settings, 'LOGIN_REDIRECT_URL', '')
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    13
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    14
 
+#TC
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    15
 
+def list():
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    16
 
+    """Start list process"""
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    17
 
+    log_url = getattr(settings, 'LOGIN_URL', '')
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    18
 
+    response = "<ul>"
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    19
 
+    # We list all wanted backends among all availables
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    20
 
+    for backend in get_backends():
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    21
 
+        for backend_str in settings.AUTHENTICATION_BACKENDS:
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    22
 
+            if backend in backend_str:
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    23
 
+                response += "<li><a href=\"" + log_url + backend + "\">" + backend + "</a></li>"
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    24
 
+    response += "</ul>"
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    25
 
+    return response
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    26
 
+#END change by TC
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    27
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    28
 
+
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    29
 
 def auth(request, backend):
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    30
 
     """Start authentication process"""
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    31
 
     complete_url = getattr(settings, 'SOCIAL_AUTH_COMPLETE_URL_NAME',
platform