Merge lp:~dholbach/harvest/bug518887 into lp:harvest

[Daniel Holbach]

[Daniel Holbach (dholbach)]

Hello? :-)

[Dylan McCall (dylanmccall)]

It is definitely a victory: it brings the number of SQL queries down to 20, and the elapsed time (as reported by debug-toolbar) to 200ms. Previously, it was immeasurably huge.

This week I'm working to replace the list templates altogether in my branch, though, so I think it's pretty well moot :)

[Paul Hummer (rockstar)]

Daniel-

  It's best to give some context when you propose a branch for merging. I'm not entirely sure what this branch really does. Sure, it cuts down the number of SQL queries, but it also removes some functionality, and I'm not sure why it is. Specifically, why are we no longer paginating things?

Cheers,
Paul

review: Needs Information

[Daniel Holbach (dholbach)]

Paul: We just show 10-15 "opportunity lists" right now, so they don't get paginated.

[James Westby (james-w)]

Looks good.

review: Approve

=== modified file 'harvest/opportunities/templates/opportunities/opportunities_by_type.html'
--- harvest/opportunities/templates/opportunities/opportunities_by_type.html	2010-02-22 15:43:51 +0000
+++ harvest/opportunities/templates/opportunities/opportunities_by_type.html	2010-03-17 11:54:18 +0000
@@ -13,55 +13,16 @@
   {% for type in types.object_list %}
     <li>
       <div class="package_name threshold{{ type.opportunity_class }}">
-        <span class="name">{{ type.name }}</span>
+        <span class="name"><a href="{{ type.get_absolute_url }}">{{ type.name }}</a></span>
         <span class="count">
             ({{ type.opportunity_set.count }} issues)
         </span>
       </div>
-      <div class="package_details">
-        <ul>
-        {% for opportunity in type.opportunity_set.all %}
-            {% include "opportunities/opportunity_detail.inc.html" %}
-        {% endfor %}
-        </ul>
-      </div>
-    </li>
   {% endfor %}
   </ul>
-
-  <div class="pagination">
-    <span class="step-links">
-    {% if types.has_previous %}
-      <a href="?page={{ types.previous_page_number }}">previous</a>
-    {% endif %}
-
-    <span class="current">
-      Page {{ types.number }} of {{ types.paginator.num_pages }}.
-    </span>
-
-    {% if types.has_next %}
-      <a href="?page={{ types.next_page_number }}">next</a>
-    {% endif %}
-    </span>
-  </div>
-
 {% else %}
   <p>{% trans "There are currently no opportunities in Harvest. :(" %}</p>
 {% endif %}
 
 </div>
-
-<script type="text/javascript">
-YUI().use('node', function(Y) {
-
-  Y.all('.package_name').on('click', function(e) {
-    // XXX: rockstar: Currently, this is kinda jumpy.  It'd be nice if it was
-    // all sexy animated.
-    Y.all('.package_details').setStyle('display', 'none');
-    e.currentTarget.next().setStyle('display', 'block');
-  });
-
-});
-
-</script>
 {% endblock %}