Rename disconnect individual view and simplify example done view. Refs #85.

diff --git a/example/app/views.py b/example/app/views.py
index 692a171eac399d942d55ed067bceacee58b0d689..2e17cd620c3ebf8ad2fdc8d8174d215eff7c44cc 100644 (file)
--- a/example/app/views.py
+++ b/example/app/views.py
@@ -19,12 +19,9 @@ def home(request):
 @login_required
 def done(request):
     """Login complete view, displays user data"""
-    names = request.user.social_auth.all()
-    ctx = {
-        'names':names,
-    }
-    ctx['version'] = version
-    ctx['last_login'] = request.session.get('social_auth_last_login_backend')
+    ctx = {'accounts': request.user.social_auth.all(),
+           'version': version,
+           'last_login': request.session.get('social_auth_last_login_backend')}
     return render_to_response('done.html', ctx, RequestContext(request))
 
 def error(request):

diff --git a/example/templates/done.html b/example/templates/done.html
index be9390b050d08bb4d55e9550902c37e9b9465df2..4084a982ad63911720be92c0b4cc33c93237a55e 100644 (file)
--- a/example/templates/done.html
+++ b/example/templates/done.html
@@ -16,17 +16,17 @@
 </div>
 
 <div>
+{% if accounts %}
   <h3>Disconnect accounts</h3>
-    <ul>
-    {% for account in names %}
-      <li>
-          <span class="disconnect">
-              <a href={% url disconnect-individual account.provider account.id %}>{{ account.provider }} ({{ account.id }})</a>
-          </span>
-          </br>
-      </li>
-    {% endfor %}
-    </ul>
+  <ul>
+  {% for account in accounts %}
+    <li>
+        <span class="disconnect"><a href={% url disconnect_individual account.provider account.id %}>{{ account.provider|title }} (ID {{ account.id }})</a></span>
+    </li>
+  {% endfor %}
+  </ul>
+{% endif %}
+
   <h3>Associate new OAuth credentials:</h3>
   <ul>
     <li>

diff --git a/social_auth/backends/__init__.py b/social_auth/backends/__init__.py
index 61e46b9ba25ad1d16aa55dc4600244d7775710c4..e41d17116d6bb66dbdbea16c53c8492a14d079e8 100644 (file)
--- a/social_auth/backends/__init__.py
+++ b/social_auth/backends/__init__.py
@@ -435,6 +435,7 @@ class BaseAuth(object):
         else:
             user.social_auth.filter(provider=self.AUTH_BACKEND.name).delete()
 
+
 class OpenIdAuth(BaseAuth):
     """OpenId process handling"""
     AUTH_BACKEND = OpenIDBackend

diff --git a/social_auth/urls.py b/social_auth/urls.py
index 19db2632610424ebab7816379caab94e7f1416f4..61dadeab468dfbd9e82f0f3a0d832e5ba6285e30 100644 (file)
--- a/social_auth/urls.py
+++ b/social_auth/urls.py
@@ -12,5 +12,6 @@ urlpatterns = patterns('',
     url(r'^associate/complete/(?P<backend>[^/]+)/$', associate_complete,
         name='associate_complete'),
     url(r'^disconnect/(?P<backend>[^/]+)/$', disconnect, name='disconnect'),
-    url(r'^disconnect-individual/(?P<backend>[^/]+)/(?P<association_id>\d+)/$', disconnect, name='disconnect-individual'),
+    url(r'^disconnect/(?P<backend>[^/]+)/(?P<association_id>\d+)/$', disconnect,
+        name='disconnect_individual'),
 )