From dac7766ee7a217a1d44fbbe98ae4e2f0e64d4688 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 18 Aug 2012 18:27:56 -0700 Subject: [PATCH 01/10] Use a named url instead of the url to reference login view --- views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views.py b/views.py index 471dacd..9c1528b 100644 --- a/views.py +++ b/views.py @@ -22,7 +22,7 @@ def login(request): # Make sure the user can accept cookies. if request.session.test_cookie_worked(): request.session.delete_test_cookie() - return redirect('/login/github/') + return redirect('socialauth_begin', backend='github') else: # During development, I've landed here a lot, despite having cookies # enabled. So, set the test cookie so that trying to login from here From 8cd494021506d10ca178cde7d31b75853a07e1dd Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 18 Aug 2012 18:40:45 -0700 Subject: [PATCH 02/10] Sort repo list --- views.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/views.py b/views.py index 9c1528b..1121e3a 100644 --- a/views.py +++ b/views.py @@ -33,10 +33,17 @@ def login(request): { 'error': "Fix your damn cookies!" }) +def _sorted_repos(request): + repos = [r for r in request.github.get_iter('users/%s/repos' % + request.user.username)] + repos.sort(key=lambda x: x['name']) + return repos + + @login_required def graph_followers(request): return render_to_response('graph_followers.html', { - 'repos': request.github.get_iter('users/%s/repos' % request.user.username) + 'repos': _sorted_repos(request) }, RequestContext(request)) @@ -45,5 +52,5 @@ def graph_repo(request, user=None, repo=None): return render_to_response('graph_repo.html', { 'graph_user': user, 'graph_repo': repo, - 'repos': request.github.get_iter('users/%s/repos' % request.user.username) + 'repos': _sorted_repos(request) }, RequestContext(request)) From e2aa534e7636a31d139db378d1745ed098e7133c Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 18 Aug 2012 18:43:17 -0700 Subject: [PATCH 03/10] Remove some remnants of a bad merge... --- templates/navbar.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/templates/navbar.html b/templates/navbar.html index 81872e1..664df17 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -23,10 +23,6 @@
  • Logout
    • -
  • Followers
    • - - From d0386b475a7c8dcdb810cb2580332f316e51e84c Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 18 Aug 2012 18:57:06 -0700 Subject: [PATCH 04/10] Fix indentation in navbar template --- templates/navbar.html | 44 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/templates/navbar.html b/templates/navbar.html index 664df17..84fd464 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -2,28 +2,28 @@
    - Cool name - - + Cool name + +
    From f306488b01c4abf9e8a385b6804c48beceb3981c Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 18 Aug 2012 18:27:56 -0700 Subject: [PATCH 05/10] Use a named url instead of the url to reference login view --- views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views.py b/views.py index 471dacd..9c1528b 100644 --- a/views.py +++ b/views.py @@ -22,7 +22,7 @@ def login(request): # Make sure the user can accept cookies. if request.session.test_cookie_worked(): request.session.delete_test_cookie() - return redirect('/login/github/') + return redirect('socialauth_begin', backend='github') else: # During development, I've landed here a lot, despite having cookies # enabled. So, set the test cookie so that trying to login from here From 9c4441914694b92f727127f4a1f4083c58e92b0d Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 18 Aug 2012 18:40:45 -0700 Subject: [PATCH 06/10] Sort repo list --- views.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/views.py b/views.py index 9c1528b..1121e3a 100644 --- a/views.py +++ b/views.py @@ -33,10 +33,17 @@ def login(request): { 'error': "Fix your damn cookies!" }) +def _sorted_repos(request): + repos = [r for r in request.github.get_iter('users/%s/repos' % + request.user.username)] + repos.sort(key=lambda x: x['name']) + return repos + + @login_required def graph_followers(request): return render_to_response('graph_followers.html', { - 'repos': request.github.get_iter('users/%s/repos' % request.user.username) + 'repos': _sorted_repos(request) }, RequestContext(request)) @@ -45,5 +52,5 @@ def graph_repo(request, user=None, repo=None): return render_to_response('graph_repo.html', { 'graph_user': user, 'graph_repo': repo, - 'repos': request.github.get_iter('users/%s/repos' % request.user.username) + 'repos': _sorted_repos(request) }, RequestContext(request)) From dab1b69fb75d99eb9490ccd65d35869b695c7290 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 18 Aug 2012 18:43:17 -0700 Subject: [PATCH 07/10] Remove some remnants of a bad merge... --- templates/navbar.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/templates/navbar.html b/templates/navbar.html index 81872e1..664df17 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -23,10 +23,6 @@
  • Logout
    • -
  • Followers
    • - - From ebd371b43fcca2c82c82b769e94cc48a8d311c3f Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 18 Aug 2012 18:57:06 -0700 Subject: [PATCH 08/10] Fix indentation in navbar template --- templates/navbar.html | 44 +++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/templates/navbar.html b/templates/navbar.html index 664df17..84fd464 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -2,28 +2,28 @@
    - Cool name - - + Cool name + +
    From 35cb9ab6b23e1c39deefade6aa77bf2904483291 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 18 Aug 2012 23:20:31 -0700 Subject: [PATCH 09/10] Me link --- templates/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/navbar.html b/templates/navbar.html index 84fd464..3d73cc3 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -4,6 +4,7 @@
    Cool name
    • From 0dd428a43d828f504c729bda86e9c2145636d201 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sat, 18 Aug 2012 23:25:24 -0700 Subject: [PATCH 10/10] Move repo list functions to githubnetwork Add repos item to context for me view. --- githubnetwork/views.py | 16 ++++++++++++++-- views.py | 14 -------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/githubnetwork/views.py b/githubnetwork/views.py index ea0f4d5..a8ee9f8 100644 --- a/githubnetwork/views.py +++ b/githubnetwork/views.py @@ -82,11 +82,22 @@ class NetworkView(DetailView): return super(ProtectedView, self).dispatch(*args, **kwargs) +def _sorted_repos(request): + '''Get a list of repos for the currently authorized user, sort it, and + return it.''' + repos = [r for r in request.github.get_iter('users/%s/repos' % + request.user.username)] + repos.sort(key=lambda x: x['name']) + return repos + + @login_required def me(request): context = RequestContext(request) context['followers'] = simplejson.dumps( - [{'name': unicode(follower), 'avatar': follower.avatar_url} for follower in GHUser.objects.filter(following=request.gh_user)]) + [{'name': unicode(follower), 'avatar': follower.avatar_url} + for follower in GHUser.objects.filter(following=request.gh_user)]) + context['repos'] = _sorted_repos(request) return render_to_response('me.html', context) @@ -95,5 +106,6 @@ def get_user_followers(request): name = request.GET.get('user', None) if not name: raise HttpResponseBadRequest() - names = simplejson.dumps([user['login'] for user in request.github.get_iter('users/%s/followers' % name)]) + names = simplejson.dumps([user['login'] + for user in request.github.get_iter('users/%s/followers' % name)]) return HttpResponse(names, content_type='application/json') diff --git a/views.py b/views.py index 1121e3a..490f0d1 100644 --- a/views.py +++ b/views.py @@ -33,20 +33,6 @@ def login(request): { 'error': "Fix your damn cookies!" }) -def _sorted_repos(request): - repos = [r for r in request.github.get_iter('users/%s/repos' % - request.user.username)] - repos.sort(key=lambda x: x['name']) - return repos - - -@login_required -def graph_followers(request): - return render_to_response('graph_followers.html', { - 'repos': _sorted_repos(request) - }, RequestContext(request)) - - @login_required def graph_repo(request, user=None, repo=None): return render_to_response('graph_repo.html', {