From d02a905110b2949ab148c8aeeca8f947a547a95e Mon Sep 17 00:00:00 2001
From: Owocki <ksowocki@gmail.com>
Date: Sat, 20 Jul 2019 11:04:22 -0600
Subject: [PATCH] a few bugfixes for the last commit to allow us to view
 leaderboards for any time cadence

---
 app/assets/v2/js/pages/leaderboard.js |  2 +-
 app/marketing/views.py                | 39 ++++++++++++++++-----------
 app/retail/templates/leaderboard.html |  2 +-
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/app/assets/v2/js/pages/leaderboard.js b/app/assets/v2/js/pages/leaderboard.js
index 7b0daf66629..e72c2a30003 100644
--- a/app/assets/v2/js/pages/leaderboard.js
+++ b/app/assets/v2/js/pages/leaderboard.js
@@ -35,7 +35,7 @@ $(document).ready(function() {
   $('#key').change(function() {
     const val = $(this).val();
 
-    document.location.href = `/leaderboard/${val}`;
+    document.location.href = `/leaderboard/${val}` + '?cadence=' + $('#cadence').val() + '&keyword=' + $('#tech-keyword').val();
   });
 
 
diff --git a/app/marketing/views.py b/app/marketing/views.py
index e870d6793ad..7c85935d1c5 100644
--- a/app/marketing/views.py
+++ b/app/marketing/views.py
@@ -673,32 +673,37 @@ def leaderboard(request, key=''):
     cadences = ['all', 'weekly', 'monthly', 'quarterly', 'yearly']
 
     keyword_search = request.GET.get('keyword', '')
+    keyword_search = '' if keyword_search == 'all' else keyword_search
     limit = request.GET.get('limit', 25)
     cadence = request.GET.get('cadence', 'quarterly')
+
+    # backwards compatibility fix for old inbound links
+    for ele in cadences:
+        key = key.replace(f"{ele}_", '')
+
     titles = {
-        f'{cadence}_payers': _('Top Funders'),
-        f'{cadence}_earners': _('Top Coders'),
-        f'{cadence}_orgs': _('Top Orgs'),
-        f'{cadence}_tokens': _('Top Tokens'),
-        f'{cadence}_keywords': _('Top Keywords'),
-        f'{cadence}_kudos': _('Top Kudos'),
-        f'{cadence}_cities': _('Top Cities'),
-        f'{cadence}_countries': _('Top Countries'),
-        f'{cadence}_continents': _('Top Continents'),
+        f'payers': _('Top Funders'),
+        f'earners': _('Top Coders'),
+        f'orgs': _('Top Orgs'),
+        f'tokens': _('Top Tokens'),
+        f'keywords': _('Top Keywords'),
+        f'kudos': _('Top Kudos'),
+        f'cities': _('Top Cities'),
+        f'countries': _('Top Countries'),
+        f'continents': _('Top Continents'),
     }
 
     if not key:
-        key = f'{cadence}_earners'
-
+        key = f'earners'
 
     if key not in titles.keys():
         raise Http404
 
     title = titles[key]
+    which_leaderboard = f"{cadence}_{key}"
+    ranks = LeaderboardRank.objects.filter(active=True, leaderboard=which_leaderboard)
     if keyword_search:
-        ranks = LeaderboardRank.objects.filter(active=True, leaderboard=key, tech_keywords__icontains=keyword_search)
-    else:
-        ranks = LeaderboardRank.objects.filter(active=True, leaderboard=key)
+        ranks = ranks.filter(tech_keywords__icontains=keyword_search)
 
     amount = ranks.values_list('amount').annotate(Max('amount')).order_by('-amount')
     items = ranks.order_by('-amount')
@@ -721,6 +726,8 @@ def leaderboard(request, key=''):
     profile_keys = ['_tokens', '_keywords', '_cities', '_countries', '_continents']
     is_linked_to_profile = any(sub in key for sub in profile_keys)
 
+    cadence_ui = cadence if cadence != 'all' else 'All-Time'
+    page_title = f'{cadence_ui.title()} {keyword_search.title()} Leaderboard: {title.title()}'
     context = {
         'items': items[0:limit],
         'nav': 'home',
@@ -728,8 +735,8 @@ def leaderboard(request, key=''):
         'cadence': cadence,
         'selected': title,
         'is_linked_to_profile': is_linked_to_profile,
-        'title': f'{keyword_search} Leaderboard: {title}',
-        'card_title': f'{keyword_search} Leaderboard: {title}',
+        'title': page_title,
+        'card_title': page_title,
         'card_desc': f'See the most valued members in the Gitcoin community recently . {top_earners}',
         'action_past_tense': 'Transacted' if 'submitted' in key else 'bountied',
         'amount_max': amount_max,
diff --git a/app/retail/templates/leaderboard.html b/app/retail/templates/leaderboard.html
index 6108e0d47a4..9fecaf6b773 100644
--- a/app/retail/templates/leaderboard.html
+++ b/app/retail/templates/leaderboard.html
@@ -57,7 +57,7 @@ <h6 class="pt-3 pb-2 text-center">
                   <!-- RESULTS TITLE & FILTER -->
 
                   <div class="col-12 my-auto col-lg-6 text-center text-md-left">
-                    <h1 class="font-header font-weight-semibold mb-lg-0">{{cadence|title}} {{ title }} </h1>
+                    <h1 class="font-header font-weight-semibold mb-lg-0">{{title}}</h1>
                   </div>
                   <div class="col-12 col-sm-6 col-lg-3 mx-auto my-2 my-md-0 text-center text-sm-right text-lg-left">
                   </div>