back to showing actually 60 of my most popular themes (bug 860786)

Author: cvan

apps/users/models.py

@@ -174,6 +174,12 @@ def addons_listed(self):
         return self.addons.reviewed().exclude(type=amo.ADDON_WEBAPP).filter(
             addonuser__user=self, addonuser__listed=True)
 
+    @amo.cached_property
+    def num_addons_listed(self):
+        """Number of public add-ons this user is listed as author of."""
+        return self.addons.reviewed().exclude(type=amo.ADDON_WEBAPP).filter(
+            addonuser__user=self, addonuser__listed=True).count()
+
     @amo.cached_property
     def apps_listed(self):
         """Public apps this user is listed as author of."""

apps/users/templates/users/profile.html

@@ -69,7 +69,11 @@ <h2>{{ _("Add-ons I've created") }}</h2>
 
 {% if personas %}
   <div id="my-themes" class="island c">
-    <h2>{{ _("Themes I've created") }}</h2>
+    {% if limited_personas %}
+      <h2>{{ _("My most popular 60 Themes") }}</h2>
+    {% else %}
+      <h2>{{ _("Themes I've created") }}</h2>
+    {% endif %}
     {{ personas|impala_persona_grid(cols=5, pagesize=15) }}
   </div>
 {% endif %}

apps/users/templates/users/vcard.html

@@ -44,11 +44,19 @@
              {{ _('{0} add-ons')|f(num) }}
           {% else %}
             <a href="{{ '#my-submissions' if is_profile else profile.get_url_path() }}">
-              {% trans cnt=num, num=num|numberfmt %}
-                {{ num }} add-on
-              {% pluralize %}
-                {{ num }} add-ons
-              {% endtrans -%}
+              {% if profile.is_artist and not profile.is_addon_developer %}
+                {% trans cnt=num, num=num|numberfmt %}
+                  {{ num }} theme
+                {% pluralize %}
+                  {{ num }} themes
+                {% endtrans -%}
+              {% else %}
+                {% trans cnt=num, num=num|numberfmt %}
+                  {{ num }} add-on
+                {% pluralize %}
+                  {{ num }} add-ons
+                {% endtrans -%}
+              {% endif %}
             </a>
           {% endif %}
         {% endwith %}

apps/users/views.py

@@ -577,14 +577,17 @@ def profile(request, user):
 
     addons = []
     personas = []
-    user.num_addons_listed = 0
+    limited_personas = False
     if user.is_developer:
         addons = user.addons.reviewed().exclude(type=amo.ADDON_WEBAPP).filter(
             addonuser__user=user, addonuser__listed=True)
-        user.num_addons_listed = addons.count()
 
+        # TODO: Paginate themes so we don't have to take a slice (bug 860306).
         personas = addons.filter(type=amo.ADDON_PERSONA).order_by(
-            '-average_daily_users')
+            '-persona__popularity')
+        if personas.count() > 60:
+            limited_personas = True
+            personas = personas[:60]
 
         addons = addons.exclude(type=amo.ADDON_PERSONA).order_by(
             '-weekly_downloads')
@@ -605,7 +608,7 @@ def get_addons(reviews):
     data = {'profile': user, 'own_coll': own_coll, 'reviews': reviews,
             'fav_coll': fav_coll, 'edit_any_user': edit_any_user,
             'addons': addons, 'own_profile': own_profile,
-            'personas': personas}
+            'personas': personas, 'limited_personas': limited_personas}
     if not own_profile:
         data['abuse_form'] = AbuseForm(request=request)