Merge pull request #859 from idlesign/feat/package_name

Package name column added to Versions panel (rebase).

Author: aaugustin

debug_toolbar/panels/versions.py

@@ -1,7 +1,6 @@
 from __future__ import absolute_import, unicode_literals
 
 import sys
-from collections import OrderedDict
 
 import django
 from django.apps import apps
@@ -24,12 +23,12 @@ def nav_subtitle(self):
 
     def generate_stats(self, request, response):
         versions = [
-            ('Python', '%d.%d.%d' % sys.version_info[:3]),
-            ('Django', self.get_app_version(django)),
+            ('Python', '', '%d.%d.%d' % sys.version_info[:3]),
+            ('Django', '', self.get_app_version(django)),
         ]
         versions += list(self.gen_app_versions())
         self.record_stats({
-            'versions': OrderedDict(sorted(versions, key=lambda v: v[0])),
+            'versions': sorted(versions, key=lambda v: v[0]),
             'paths': sys.path,
         })
 
@@ -39,7 +38,7 @@ def gen_app_versions(self):
             app = app_config.module
             version = self.get_app_version(app)
             if version:
-                yield name, version
+                yield app.__name__, name, version
 
     def get_app_version(self, app):
         if hasattr(app, 'get_version'):

debug_toolbar/templates/debug_toolbar/panels/versions.html

@@ -1,15 +1,19 @@
 {% load i18n %}
 <table>
+    <col style="width:15%">
+    <col style="width:15%">
 	<thead>
 		<tr>
+            <th>{% trans "Package" %}</th>
 			<th>{% trans "Name" %}</th>
 			<th>{% trans "Version" %}</th>
 		</tr>
 	</thead>
 	<tbody>
-		{% for package, version in versions.items %}
+		{% for package, name, version in versions %}
 			<tr class="{% cycle 'djDebugOdd' 'djDebugEven' %}">
 				<td>{{ package }}</td>
+                <td>{{ name }}</td>
 				<td>{{ version }}</td>
 			</tr>
 		{% endfor %}