allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [2/2] git commit: [#7369] don't let sort="None" be set as a js var; use empty string
Date Mon, 05 May 2014 21:24:49 GMT
[#7369] don't let sort="None" be set as a js var; use empty string


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

Branch: refs/heads/db/7369
Commit: 8cf970b34b553c597b5a8da2c071f60de77fabc6
Parents: c29c5d5
Author: Dave Brondsema <dbrondsema@slashdotmedia.com>
Authored: Mon May 5 21:24:07 2014 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Mon May 5 21:24:07 2014 +0000

----------------------------------------------------------------------
 ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit.html | 2 +-
 .../templates/tracker_widgets/ticket_search_results.html           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/8cf970b3/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit.html b/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit.html
index e565625..06e9cda 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit.html
@@ -48,7 +48,7 @@
     {{widget.fields['lightbox'].display()}}
     {{widget.fields['page_list'].display(limit=limit, page=page, count=count)}}
     <script type="text/javascript">
-      var q="{{query and h.urlquoteplus(query) or ''}}", count={{count}}, limit={{limit}},
page={{page}}, sort="{{sort}}";
+      var q="{{query and h.urlquoteplus(query) or ''}}", count={{count}}, limit={{limit}},
page={{page}}, sort="{{sort if sort else ''}}";
     </script>
   {% else %}
     No tickets found.

http://git-wip-us.apache.org/repos/asf/allura/blob/8cf970b3/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 f9ee976..2634bbe 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_search_results.html
@@ -126,7 +126,7 @@
   {% endif %}
   {{widget.fields['page_list'].display(limit=limit, page=page, count=count)}}
   <script type="text/javascript">
-    var q="{{query and h.urlquoteplus(query) or ''}}", count={{count}}, limit={{limit}},
page={{page}}, sort="{{sort}}";
+    var q="{{query and h.urlquoteplus(query) or ''}}", count={{count}}, limit={{limit}},
page={{page}}, sort="{{sort if sort else ''}}";
     var filter = {{h.escape_json(filter or {})|safe}};
   </script>
 </div>


Mime
View raw message