incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [1/3] git commit: [#4227] [#4511] ticket:551 Use double quotes, since single quotes doesn't work
Date Fri, 07 Mar 2014 15:44:12 GMT
Repository: incubator-allura
Updated Branches:
  refs/heads/master 1bf1e8d9c -> e1fc8755c


[#4227] [#4511] ticket:551 Use double quotes, since single quotes doesn't work


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/9a0a6a14
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/9a0a6a14
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/9a0a6a14

Branch: refs/heads/master
Commit: 9a0a6a1459d9135b9d5b40109d80e6d007be0445
Parents: 0fc1624
Author: Igor Bondarenko <jetmind2@gmail.com>
Authored: Thu Mar 6 12:49:25 2014 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Fri Mar 7 15:12:40 2014 +0000

----------------------------------------------------------------------
 ForgeTracker/forgetracker/templates/tracker/ticket.html          | 2 +-
 .../templates/tracker_widgets/ticket_search_results.html         | 2 +-
 ForgeTracker/forgetracker/tests/functional/test_root.py          | 4 ++--
 ForgeWiki/forgewiki/templates/wiki/page_view.html                | 2 +-
 ForgeWiki/forgewiki/tests/functional/test_root.py                | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9a0a6a14/ForgeTracker/forgetracker/templates/tracker/ticket.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/ticket.html b/ForgeTracker/forgetracker/templates/tracker/ticket.html
index dc4b56e..d2e4386 100644
--- a/ForgeTracker/forgetracker/templates/tracker/ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/ticket.html
@@ -86,7 +86,7 @@
         <label class="simple">Labels: </label>
         {% for label in ticket.labels %}
           <span class="ui-corner-all tag">
-              <a href="../search?q=labels:'{{h.urlquoteplus(label)}}'">{{label}} ({{ticket.artifacts_labeled_with(label,
ticket.app_config).count()}})</a>
+              <a href="../search?q=labels:%22{{h.urlquoteplus(label)}}%22">{{label}}
({{ticket.artifacts_labeled_with(label, ticket.app_config).count()}})</a>
           </span>
         {% else %}
           None

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9a0a6a14/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
index f8515db..80da8f5 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
@@ -59,7 +59,7 @@
               {% elif col['name'] == 'labels' %}
               <td>
                   {%- for l in t.labels -%}
-                  <a href="{{c.app.url}}search?q=labels:'{{h.urlquoteplus(l)}}'">{{l}}</a>
+                  <a href="{{c.app.url}}search?q=labels:%22{{h.urlquoteplus(l)}}%22">{{l}}</a>
                     {%- if not loop.last -%}, {% endif -%}
                   {%- endfor -%}
               </td>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9a0a6a14/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index d3a8200..9642c38 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -287,13 +287,13 @@ class TestFunctionalController(TrackerTestController):
 
     def test_new_ticket(self):
         summary = 'test new ticket'
-        ticket_view = self.new_ticket(summary=summary, labels="test label").follow()
+        ticket_view = self.new_ticket(summary=summary).follow()
         assert_true(summary in ticket_view)
         assert 'class="artifact_subscribe' in ticket_view
 
     def test_labels(self):
         ticket_view = self.new_ticket(summary='summary', labels="test label").follow()
-        assert '''<a href="../search?q=labels:'test+label'">test label (1)</a>'''
in ticket_view
+        assert '''<a href="../search?q=labels:%22test+label%22">test label (1)</a>'''
in ticket_view
 
     def test_new_with_milestone(self):
         ticket_view = self.new_ticket(

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9a0a6a14/ForgeWiki/forgewiki/templates/wiki/page_view.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_view.html b/ForgeWiki/forgewiki/templates/wiki/page_view.html
index 817db02..95c2e0e 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_view.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_view.html
@@ -66,7 +66,7 @@
     <label class="simple">Labels: </label>
     {% for label in page.labels %}
       {% if label != '' %}
-        <span><a href="{{c.app.url}}search/?q=labels_t:'{{label}}'&parser=standard">{{label}}
({{page.artifacts_labeled_with(label, page.app_config).count()}})</a></span>
+        <span><a href="{{c.app.url}}search/?q=labels_t:%22{{label}}%22&parser=standard">{{label}}
({{page.artifacts_labeled_with(label, page.app_config).count()}})</a></span>
       {% endif %}
     {% endfor %}
   </div>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/9a0a6a14/ForgeWiki/forgewiki/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/tests/functional/test_root.py b/ForgeWiki/forgewiki/tests/functional/test_root.py
index 86d0c3a..6239a6b 100644
--- a/ForgeWiki/forgewiki/tests/functional/test_root.py
+++ b/ForgeWiki/forgewiki/tests/functional/test_root.py
@@ -177,7 +177,7 @@ class TestRootController(TestController):
                 'text': 'sometext',
                 'labels': 'test label',
                 'viewable_by-0.id': 'all'}).follow()
-        assert '''<a href="/p/test/wiki/search/?q=labels_t:'test label'&parser=standard">test
label (1)</a>''' in response
+        assert '''<a href="/p/test/wiki/search/?q=labels_t:%22test label%22&parser=standard">test
label (1)</a>''' in response
 
     def test_title_slashes(self):
         # forward slash not allowed in wiki page title - converted to dash


Mime
View raw message