瀏覽代碼

revert view.py: github function due to merge conflict

mk200789 10 年之前
父節點
當前提交
263d729fa2
共有 1 個文件被更改,包括 6 次插入1 次删除
  1. 6 1
      hackathon_starter/hackathon/views.py

+ 6 - 1
hackathon_starter/hackathon/views.py

@@ -128,12 +128,17 @@ def github(request):
     list = getTopContributedRepositories(repositories)
     # Get a list of the top 10 most committed repositories
     filtered = filterCommits(list)
+    # Get list of all stargazer counts for all repositories
+    stargazers = getStarGazerCount()
+    # Return list of top 10 stargazed repositories
+    filteredStargazers = filterStarGazerCount(stargazers)
+    
     # Store data into a dictionary for rendering
     allData['userData'] = userData
     allData['filteredData'] = filtered
     allData['filteredStargazers'] = filteredStargazers
 
-    return render(request, 'hackathon/github.html', { 'data': userData })
+    return render(request, 'hackathon/github.html', { 'data': allData })
 
 def tumblr(request):
     meta, response, blog = tumblrBlogInfo('david')