This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new aeee81a show form if any query string is present
new 3b41d3f Merge branch 'master' of github.com:apache/whimsy
aeee81a is described below
commit aeee81ab0d448c5f9ce4a272e71386991ae32fc7
Author: Sam Ruby <[email protected]>
AuthorDate: Tue Apr 7 09:29:36 2020 -0400
show form if any query string is present
---
www/members/inactive.cgi | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/www/members/inactive.cgi b/www/members/inactive.cgi
index e4f4e99..cc000a9 100755
--- a/www/members/inactive.cgi
+++ b/www/members/inactive.cgi
@@ -44,7 +44,7 @@ _html do
'missed' => 0,
'status' => 'active - attended meetings recently'
}
- active = (tracker[$USER]['missed'] == 0)
+ active = (tracker[$USER]['missed'] == 0) && (ENV['QUERY_STRING'] == '')
_whimsy_body(
title: PAGETITLE,
subtitle: active ? 'Your Attendance Status' : 'Poll Of Inactive Members',
@@ -140,10 +140,12 @@ _html do
_p 'Update your status (if you are inactive):'
_button.btn.btn_success 'I wish to remain active',
name: 'status', value: 'remain active',
- disabled: active or tracker[$USER]['status'] == 'remain active'
+ disabled: tracker[$USER]['missed'] == 0 or
+ tracker[$USER]['status'] == 'remain active'
_button.btn.btn_warning 'I would like to go emeritus',
name: 'status', value: 'go emeritus',
- disabled: active or tracker[$USER]['status'] == 'go emeritus'
+ disabled: tracker[$USER]['missed'] == 0 or
+ tracker[$USER]['status'] == 'remain active'
end
_p_ %{
