You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2017/01/22 18:11:38 UTC

incubator-ponymail git commit: GUI ignores date span in list.html URI if query is blank

Repository: incubator-ponymail
Updated Branches:
  refs/heads/master ef21e7ee8 -> 7834846cd


GUI ignores date span in list.html URI if query is blank

This fixes #346

Project: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/commit/7834846c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/tree/7834846c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ponymail/diff/7834846c

Branch: refs/heads/master
Commit: 7834846cd4d4ed8b9e621c802f874b587b7d9cdc
Parents: ef21e7e
Author: Sebb <se...@apache.org>
Authored: Sun Jan 22 18:11:24 2017 +0000
Committer: Sebb <se...@apache.org>
Committed: Sun Jan 22 18:11:24 2017 +0000

----------------------------------------------------------------------
 CHANGELOG.md                        | 1 +
 site/js/dev/ponymail_pagebuilder.js | 2 +-
 site/js/ponymail.js                 | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/7834846c/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea4dd0a..2d1210f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -128,6 +128,7 @@
 - ponymail.js creates/displays dates with no timezone - confusing (#286)
 - Make it clearer when you're not logged in. (#195)
 - list name not normalised when imported (#253)
+- GUI ignores date span in list.html URI if query is blank (#346)
 
 ## CHANGES in 0.9b:
 

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/7834846c/site/js/dev/ponymail_pagebuilder.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_pagebuilder.js b/site/js/dev/ponymail_pagebuilder.js
index e25e5c8..4191ea1 100644
--- a/site/js/dev/ponymail_pagebuilder.js
+++ b/site/js/dev/ponymail_pagebuilder.js
@@ -547,7 +547,7 @@ function getListInfo(list, xdomain, nopush) {
             kiddos[n].setAttribute("class", "label label-default label-hover")
         }
         document.getElementById('listtitle').innerHTML = list + ", last month <a href='api/atom.lua?list=" + list + "'><img src='images/atom.png'></a>"
-        if (current_query == "") {
+        if (current_query == "" && current_retention == "") {
             global_deep = false
             current_query = ""
             GetAsync("/api/stats.lua?list=" + listname + "&domain=" + domain, null, buildPage)

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/7834846c/site/js/ponymail.js
----------------------------------------------------------------------
diff --git a/site/js/ponymail.js b/site/js/ponymail.js
index 341536e..089d149 100644
--- a/site/js/ponymail.js
+++ b/site/js/ponymail.js
@@ -4143,7 +4143,7 @@ function getListInfo(list, xdomain, nopush) {
             kiddos[n].setAttribute("class", "label label-default label-hover")
         }
         document.getElementById('listtitle').innerHTML = list + ", last month <a href='api/atom.lua?list=" + list + "'><img src='images/atom.png'></a>"
-        if (current_query == "") {
+        if (current_query == "" && current_retention == "") {
             global_deep = false
             current_query = ""
             GetAsync("/api/stats.lua?list=" + listname + "&domain=" + domain, null, buildPage)