[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit a48d8b8518514353408d92356b6a7f2215867164
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 21 09:07:37 2009 +0000

    2009-12-21  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Exception on queue status server
            https://bugs.webkit.org/show_bug.cgi?id=32812
    
            Turns out we need to pass the id to the filter.
    
            * QueueStatusServer/filters/webkit_extras.py:
            * QueueStatusServer/templates/patch.html:
            * QueueStatusServer/templates/recentstatus.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52437 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e52a2e7..b35863a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-21  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Exception on queue status server
+        https://bugs.webkit.org/show_bug.cgi?id=32812
+
+        Turns out we need to pass the id to the filter.
+
+        * QueueStatusServer/filters/webkit_extras.py:
+        * QueueStatusServer/templates/patch.html:
+        * QueueStatusServer/templates/recentstatus.html:
+
 2009-12-20  Chris Jerdonek  <chris.jerdonek at gmail.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/QueueStatusServer/filters/webkit_extras.py b/WebKitTools/QueueStatusServer/filters/webkit_extras.py
index 801da56..b645f78 100644
--- a/WebKitTools/QueueStatusServer/filters/webkit_extras.py
+++ b/WebKitTools/QueueStatusServer/filters/webkit_extras.py
@@ -46,14 +46,14 @@ def webkit_linkify(value):
 @register.filter
 @stringfilter
 def webkit_bug_id(value):
-    return '<a href="http://webkit.org/b/' + value + '">' + value + '</a>'
+    return '<a href="http://webkit.org/b/%s">%s</a>' % (value, value)
 
 @register.filter
 @stringfilter
 def webkit_attachment_id(value):
-    return '<a href="https://bugs.webkit.org/attachment.cgi?id=' + value + '&action=prettypatch">' + value + '</a>'
+    return '<a href="https://bugs.webkit.org/attachment.cgi?id=%s&action=prettypatch">%s</a>' % (value, value)
 
 @register.filter
 @stringfilter
-def results_link(status):
-    return '<a href="/results/' + status.key().id() + '">results</a>'
+def results_link(status_id):
+    return '<a href="/results/%s">results</a>' % status_id
diff --git a/WebKitTools/QueueStatusServer/templates/patch.html b/WebKitTools/QueueStatusServer/templates/patch.html
index e2ffd8d..de334a5 100644
--- a/WebKitTools/QueueStatusServer/templates/patch.html
+++ b/WebKitTools/QueueStatusServer/templates/patch.html
@@ -13,7 +13,7 @@
   <ul>{% for status in statuses %}
     <li>
       <span class="status-message">{{ status.message|force_escape|urlize|webkit_linkify|safe }}</span>{% if status.results_file %}
-      <span class="status-results">[{{ status|results_link|safe }}]</span>{% endif %}
+      <span class="status-results">[{{ status.key.id|results_link|safe }}]</span>{% endif %}
       <span class="status-date">{{ status.date|timesince }} ago</span>
     </li>{% endfor %}
   </ul>
diff --git a/WebKitTools/QueueStatusServer/templates/recentstatus.html b/WebKitTools/QueueStatusServer/templates/recentstatus.html
index a55e0a6..2bb9fbb 100644
--- a/WebKitTools/QueueStatusServer/templates/recentstatus.html
+++ b/WebKitTools/QueueStatusServer/templates/recentstatus.html
@@ -15,7 +15,7 @@
         {{ status.active_bug_id|force_escape|webkit_bug_id|safe }}:
       </span>{% endif %}
       <span class="status-message">{{ status.message|force_escape|urlize|webkit_linkify|safe }}</span>{% if status.results_file %}
-      <span class="status-results">[{{ status|results_link|safe }}]</span>{% endif %}
+      <span class="status-results">[{{ status.key.id|results_link|safe }}]</span>{% endif %}
       <span class="status-date">{{ status.date|timesince }} ago</span>
     </li>{% endfor %}
   </ul>

-- 
WebKit Debian packaging