[csw-devel] SF.net SVN: gar:[14793] csw/mgar/gar/v2/lib/web

Sun Jun 12 22:31:32 CEST 2011

Revision: 14793
          http://gar.svn.sourceforge.net/gar/?rev=14793&view=rev
Author:   wahwah
Date:     2011-06-12 20:31:32 +0000 (Sun, 12 Jun 2011)

Log Message:
-----------
pkgdb-web: Better display of error tag lists

Transformed the list into a table, added catalog information, which explains
previously seemingly duplicate entries.

Modified Paths:
--------------
    csw/mgar/gar/v2/lib/web/pkgdb_web.py
    csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html

Modified: csw/mgar/gar/v2/lib/web/pkgdb_web.py
===================================================================

--- csw/mgar/gar/v2/lib/web/pkgdb_web.py	2011-06-12 20:23:43 UTC (rev 14792)
+++ csw/mgar/gar/v2/lib/web/pkgdb_web.py	2011-06-12 20:31:32 UTC (rev 14793)
@@ -27,7 +27,6 @@
   r'/error-tags/([^/]+)/', 'ErrorTagDetail',
   r'/catalognames/', 'CatalognameList',
   r'/catalognames/([^/]+)/', 'Catalogname',
-  r'/error-tags/', 'ErrorTagList',
   r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/', 'Catalogs',
   r'/rest/catalogs/([^/]+)/(sparc|i386)/(SunOS[^/]+)/pkgname-by-filename',
       'PkgnameByFilename',
@@ -221,7 +220,7 @@
           models.Srv4FileStats.q.use_to_generate_catalogs==True,
           ),
         join=join,
-    ).orderBy(('basename', 'tag_info'))
+    ).orderBy(('basename', 'tag_info', 'os_rel_id', 'arch_id', 'catrel_id'))
     return render.ErrorTagDetail(tag_name, tags)
 
 class ErrorTagList(object):

Modified: csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html
===================================================================
--- csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html	2011-06-12 20:23:43 UTC (rev 14792)
+++ csw/mgar/gar/v2/lib/web/templates/ErrorTagDetail.html	2011-06-12 20:31:32 UTC (rev 14793)
@@ -8,13 +8,33 @@
   </head>
   <body>
     <h3>$tag_name</h3>
-    <ul>
+    <table>
+    <tr>
+    <th>file name</th>
+    <th>OS release</th>
+    <th>Architecture</th>
+    <th>Catalog release</th>
+    <th>Additional information</th>
+    </tr>
 $for tag in tags:
   $if tag.srv4_file.registered:
-    <li>
-    <a href="../../srv4/$tag.srv4_file.md5_sum/">$tag.srv4_file.basename</a>:
+    <tr>
+    <td>
+    <a href="../../srv4/$tag.srv4_file.md5_sum/">$tag.srv4_file.basename</a>
+    </td>
+    <td>
+    $tag.os_rel.full_name
+    </td>
+    <td>
+    $tag.arch.name
+    </td>
+    <td>
+    $tag.catrel.name
+    </td>
+    <td>
     $tag.tag_info
-    </li>
-</ul>
+    </td>
+    </tr>
+</table>
 </body>
 </html>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
