ponymail-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject incubator-ponymail git commit: GUI does not report maxResult truncation correctly
Date Tue, 17 Jan 2017 19:47:02 GMT
Repository: incubator-ponymail
Updated Branches:
  refs/heads/master c5a83ecc0 -> f7c222b23


GUI does not report maxResult truncation correctly

This fixes #335

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

Branch: refs/heads/master
Commit: f7c222b231b020a0cf549a13e12da454ec283756
Parents: c5a83ec
Author: Sebb <sebb@apache.org>
Authored: Tue Jan 17 19:46:49 2017 +0000
Committer: Sebb <sebb@apache.org>
Committed: Tue Jan 17 19:46:49 2017 +0000

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


http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/f7c222b2/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09cae3a..adfe800 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -124,6 +124,7 @@
 - indicate which months are outside the archive span for a list (#340)
 - default to medium ID generator (#343)
 - scroll/scan is not supported in ES 5.x (#344)
+- GUI does not report maxResult truncation correctly (#335)
 
 ## CHANGES in 0.9b:
 

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/f7c222b2/site/js/dev/ponymail_pagebuilder.js
----------------------------------------------------------------------
diff --git a/site/js/dev/ponymail_pagebuilder.js b/site/js/dev/ponymail_pagebuilder.js
index b3fa9f8..b9f3c39 100644
--- a/site/js/dev/ponymail_pagebuilder.js
+++ b/site/js/dev/ponymail_pagebuilder.js
@@ -151,8 +151,9 @@ function buildStats(json, state, show) {
         return;
     }
 
-    if (json.emails && json.emails.length >= json.max) {
-        stats.innerHTML += "<font color='#FA0'>More than " + json.max.toLocaleString()
+ " emails found, truncating!</font><br/>"
+//  See bug 335 for why only equality matters here
+    if (json.emails && json.emails.length == json.max) {
+        stats.innerHTML += "<font color='#FA0'>Reached the limit of " + json.max.toLocaleString()
+ " emails, truncation may have occurred</font><br/>"
     }
     var ap = ""
     if (json.numparts && json.numparts > 1) {

http://git-wip-us.apache.org/repos/asf/incubator-ponymail/blob/f7c222b2/site/js/ponymail.js
----------------------------------------------------------------------
diff --git a/site/js/ponymail.js b/site/js/ponymail.js
index 9bd26e7..fea831e 100644
--- a/site/js/ponymail.js
+++ b/site/js/ponymail.js
@@ -3768,8 +3768,9 @@ function buildStats(json, state, show) {
         return;
     }
 
-    if (json.emails && json.emails.length >= json.max) {
-        stats.innerHTML += "<font color='#FA0'>More than " + json.max.toLocaleString()
+ " emails found, truncating!</font><br/>"
+//  See bug 335 for why only equality matters here
+    if (json.emails && json.emails.length == json.max) {
+        stats.innerHTML += "<font color='#FA0'>Reached the limit of " + json.max.toLocaleString()
+ " emails, truncation may have occurred</font><br/>"
     }
     var ap = ""
     if (json.numparts && json.numparts > 1) {


Mime
View raw message