Merge lp:~cjohnston/qa-dashboard/1086158 into lp:qa-dashboard

[Chris Johnston]

Fixes broken log url's for smoke results

Fixes broken smoke log URLs

------------- This line and the following will be ignored --------------

Source: lp:~chrisjohnston/qa-dashboard/1086158
Target: lp:qa-dashboard

[Joe Talbott (joetalbott)]

LGTM, Thanks.

review: Approve

=== modified file 'dashboard/management/commands/jenkins_pull.py'
--- dashboard/management/commands/jenkins_pull.py	2012-11-30 15:16:23 +0000
+++ dashboard/management/commands/jenkins_pull.py	2012-12-04 12:12:21 +0000
@@ -312,7 +312,7 @@
                             if regexes['artifact-ignore'].match(path):
                                 continue
 
-                            remote_url = "%s/artifact/%s" % (build_url, path)
+                            remote_url = "%sartifact/%s" % (build_url, path)
                             art_args = {
                                     'display_name': path,
                                     'remote_url': remote_url,

=== modified file 'dashboard/templates/smoke/result_logs.html'
--- dashboard/templates/smoke/result_logs.html	2012-11-20 02:23:46 +0000
+++ dashboard/templates/smoke/result_logs.html	2012-12-04 12:12:21 +0000
@@ -61,7 +61,7 @@
       {% endfor %}
       <tr>
         <td>
-          <a href='{{result.jenkins_url}}console'>Console Output</a>
+          <a href='{{result.jenkins_url}}/console'>Console Output</a>
         </td>
       </tr>
     </tbody>