diff mbox

[Branch,~linaro-validation/lava-dashboard/trunk] Rev 244: Merge 0.6b3 changes

Message ID 20110715000223.28860.71055.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

Zygmunt Krynicki July 15, 2011, 12:02 a.m. UTC
Merge authors:
  Zygmunt Krynicki (zkrynicki)
Related merge proposals:
  https://code.launchpad.net/~linaro-validation/lava-dashboard/0.6b3/+merge/68042
  proposed by: Zygmunt Krynicki (zkrynicki)
------------------------------------------------------------
revno: 244 [merge]
committer: Zygmunt Krynicki <zygmunt.krynicki@linaro.org>
branch nick: lava-dashboard
timestamp: Fri 2011-07-15 02:00:35 +0200
message:
  Merge 0.6b3 changes
  
  Note: I removed the two symlinks I added by accident
removed:
  production/reports/
  production/views/
modified:
  dashboard_app/__init__.py
  dashboard_app/templates/dashboard_app/_test_run_list_table.html
  dashboard_app/templates/dashboard_app/bundle_list.html
  dashboard_app/templates/dashboard_app/test_run_detail.html
  dashboard_app/views.py


--
lp:lava-dashboard
https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk

You are subscribed to branch lp:lava-dashboard.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dashboard/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'dashboard_app/__init__.py'
--- dashboard_app/__init__.py	2011-07-13 11:12:37 +0000
+++ dashboard_app/__init__.py	2011-07-13 17:29:34 +0000
@@ -20,4 +20,4 @@ 
 Dashboard Application (package)
 """
 
-__version__ = (0, 6, 0, "beta", 2)
+__version__ = (0, 6, 0, "beta", 3)

=== modified file 'dashboard_app/templates/dashboard_app/_test_run_list_table.html'
--- dashboard_app/templates/dashboard_app/_test_run_list_table.html	2011-07-12 02:34:12 +0000
+++ dashboard_app/templates/dashboard_app/_test_run_list_table.html	2011-07-13 17:28:32 +0000
@@ -5,7 +5,7 @@ 
       <th>{% trans "Test Run" %}</th>
       <th>{% trans "Test" %}</th>
       <th>{% trans "Uploaded On" %} </th>
-      <th>{% trans "Analyzed" %}</th>
+      <th>{% trans "Analyzed On" %}</th>
       <th>{% trans "Pass" %}</th>
       <th>{% trans "Fail" %}</th>
       <th>{% trans "Skip" %}</th>
@@ -17,8 +17,8 @@ 
     <tr>
       <td><a href="{{ test_run.get_absolute_url }}"><code>{{ test_run.analyzer_assigned_uuid }}<code/></a></td>
       <td><a href="{{ test_run.test.get_absolute_url }}">{{ test_run.test }}</a></td>
-      <td>{{ test_run.bundle.uploaded_on }}</td>
-      <td>{{ test_run.analyzer_assigned_date }}</td>
+      <td>{{ test_run.bundle.uploaded_on|date:"Y-m-d H:i:s" }}</td>
+      <td>{{ test_run.analyzer_assigned_date|date:"Y-m-d H:i:s" }}</td>
       {% with test_run.get_summary_results as summary %}
       <td>{{ summary.pass|default:0 }}</td>
       <td>{{ summary.fail|default:0 }}</td>

=== modified file 'dashboard_app/templates/dashboard_app/bundle_list.html'
--- dashboard_app/templates/dashboard_app/bundle_list.html	2011-07-12 03:00:26 +0000
+++ dashboard_app/templates/dashboard_app/bundle_list.html	2011-07-13 17:28:32 +0000
@@ -72,7 +72,7 @@ 
     {% for bundle in bundle_list %}
     <tr>
       <td><a href="{{ bundle.get_absolute_url }}"><code>{{ bundle.content_sha1 }}</code></a></td>
-      <td>{{ bundle.uploaded_on }}</td>
+      <td>{{ bundle.uploaded_on|date:"Y-m-d H:i:s"}}</td>
       <td>
         {% if bundle.uploaded_by %}
         {{ bundle.uploaded_by }}

=== modified file 'dashboard_app/templates/dashboard_app/test_run_detail.html'
--- dashboard_app/templates/dashboard_app/test_run_detail.html	2011-07-12 02:34:12 +0000
+++ dashboard_app/templates/dashboard_app/test_run_detail.html	2011-07-13 17:28:46 +0000
@@ -28,7 +28,7 @@ 
         <td>{{ test_result.test_case|default_if_none:"<em>Not specified</em>" }}</td>
         <td>
           <a href ="{{test_result.get_absolute_url}}">
-            <img src="{{ STATIC_URL }}images/icon-{{ test_result.result_code }}.png"
+            <img src="{{ STATIC_URL }}dashboard_app/images/icon-{{ test_result.result_code }}.png"
             alt="{{ test_result.get_result_display }}" width="16" height="16" border="0"/></a>
           <a href ="{{test_result.get_absolute_url}}">{{ test_result.get_result_display }}</a>
         </td>

=== modified file 'dashboard_app/views.py'
--- dashboard_app/views.py	2011-07-13 12:29:53 +0000
+++ dashboard_app/views.py	2011-07-13 17:28:57 +0000
@@ -327,7 +327,7 @@ 
 @BreadCrumb(
     "{content_filename}",
     parent=attachment_list,
-    needs=['pathname', 'content_sha1', 'analyzer_assigned_uuid', 'content_filename'])
+    needs=['pathname', 'content_sha1', 'analyzer_assigned_uuid', 'pk'])
 def attachment_detail(request, pathname, content_sha1, analyzer_assigned_uuid, pk):
     attachment = get_restricted_object_or_404(
         Attachment,
@@ -342,6 +342,7 @@ 
                 pathname=pathname,
                 content_sha1=content_sha1,
                 analyzer_assigned_uuid=analyzer_assigned_uuid,
+                pk=pk,
                 content_filename=attachment.content_filename),
             "attachment": attachment,
         }, RequestContext(request))

=== removed directory 'production/reports'
=== removed directory 'production/views'