From c66cba7f8fec882c365422a76a991bb63401212c Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 2 Apr 2009 17:41:14 +0000 Subject: [PATCH] - web: in filtered job lists, "pending" should include "inconclusive", and "invalid" should include "too late to validate" svn path=/trunk/boinc/; revision=17726 --- checkin_notes | 8 ++++++++ html/inc/result.inc | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/checkin_notes b/checkin_notes index 54220b10b7..f53408402d 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3557,3 +3557,11 @@ Charlie 2 Apr 2009 screensaver_win.h mac_build/ Mac_SA_Secure.sh + +David 2 Apr 2009 + - web: in filtered job lists, + "pending" should include "inconclusive", + and "invalid" should include "too late to validate" + + html/inc/ + result.inc diff --git a/html/inc/result.inc b/html/inc/result.inc index 840efd5b4b..b95a7ee5fa 100644 --- a/html/inc/result.inc +++ b/html/inc/result.inc @@ -71,9 +71,9 @@ $state_name = array( $state_clause = array( "", " and server_state=4 ", - " and server_state=5 and outcome=1 and validate_state=0 ", + " and server_state=5 and outcome=1 and (validate_state=0 or validate_state=4) ", " and server_state=5 and outcome=1 and validate_state=1 ", - " and server_state=5 and outcome=1 and validate_state=2 ", + " and server_state=5 and outcome=1 and (validate_state=2 or validate_state=5) ", " and server_state=5 and outcome=3 ", );