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/django_contrib_auth_views.diff
author verrierj
Thu, 29 Sep 2011 11:57:25 +0200
changeset 185 aa4cb9c16ba1
parent 57 795f01224eef
permissions -rw-r--r--
Fixed display bugs + add tinyMCE
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
 
--- Django-1.3/django/contrib/auth/views.py.OLD	jeu. avr. 14 15:48:14 2011
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
     2
 
+++ Django-1.3/django/contrib/auth/views.py	jeu. avr. 14 15:48:32 2011
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
     3
 
@@ -18,6 +18,9 @@
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
     4
 
 from django.contrib.auth.tokens import default_token_generator
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
     5
 
 from django.contrib.sites.models import get_current_site
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
 
+#CHANGE BY TC FOR IRI'S PLATFORM
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
     8
 
+from social_auth.views import list as social_list
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
     9
 
+#END TC
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
 
 @csrf_protect
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    12
 
 @never_cache
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    13
 
@@ -63,6 +66,7 @@
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    14
 
         redirect_field_name: redirect_to,
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    15
 
         'site': current_site,
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    16
 
         'site_name': current_site.name,
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    17
 
+        'social_list': social_list
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    18
 
     }
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    19
 
     context.update(extra_context or {})
795f01224eef changes after social_auth integration, new way to create the
cavaliet
parents:
diff changeset 
    20
 
     return render_to_response(template_name, context,
platform