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/templates/navbar.html b/templates/navbar.html index 81872e1..3d73cc3 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -2,32 +2,28 @@
diff --git a/views.py b/views.py index 471dacd..490f0d1 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 @@ -33,17 +33,10 @@ def login(request): { 'error': "Fix your damn cookies!" }) -@login_required -def graph_followers(request): - return render_to_response('graph_followers.html', { - 'repos': request.github.get_iter('users/%s/repos' % request.user.username) - }, RequestContext(request)) - - @login_required 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))