This is an automated email from the ASF dual-hosted git repository.
sebb 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 1152060c Return all the fields
1152060c is described below
commit 1152060cc27557a9fdbfdc515edbd66247fdbb38
Author: Sebb <[email protected]>
AuthorDate: Mon Mar 11 11:03:13 2024 +0000
Return all the fields
---
www/secretary/workbench/views/memapp.json.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/www/secretary/workbench/views/memapp.json.rb
b/www/secretary/workbench/views/memapp.json.rb
index 07cd8e7d..02001b9a 100644
--- a/www/secretary/workbench/views/memapp.json.rb
+++ b/www/secretary/workbench/views/memapp.json.rb
@@ -10,7 +10,7 @@ received = Dir["#{meetings}/2*/memapp-received.txt"].max
# ------- -------- --------- ------ --------------- ------------------
# yes no no no user-id_ User name
# N.B. user id can contain - and _
-pattern = /^\w+\s+(\w+)\s+(\w+)\s+(\w+)\s+([a-z][a-z_0-9-]+)\s+(.*?)\s*\n/
+pattern = /^(\w+)\s+(\w+)\s+(\w+)\s+(\w+)\s+([a-z][a-z_0-9-]+)\s+(.*?)\s*\n/
if Date.today - Date.parse(received[/\d{8}/]) <= 32
table = File.read(received).scan(pattern)
else
@@ -18,5 +18,5 @@ else
end
# map contents to a hash
-fields = %w(apply mail karma id name)
+fields = %w(invite apply mail karma id name)
{received: table.map {|results| fields.zip(results).to_h}.sort_by {|k|
k['name']}}