[whimsy] branch master updated: Improve name matching

[sebb]

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 e30d6166 Improve name matching
e30d6166 is described below

commit e30d6166c0e9711ed8b99e7ade9488bac0356b8b
Author: Sebb <s...@apache.org>
AuthorDate: Thu Jan 12 00:39:22 2023 +0000

    Improve name matching
---
 www/secretary/workbench/views/forms/emeritus-request.js.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/www/secretary/workbench/views/forms/emeritus-request.js.rb 
b/www/secretary/workbench/views/forms/emeritus-request.js.rb
index 2313c091..2525acd4 100644
--- a/www/secretary/workbench/views/forms/emeritus-request.js.rb
+++ b/www/secretary/workbench/views/forms/emeritus-request.js.rb
@@ -52,14 +52,15 @@ class EmeritusRequest < Vue
         @members.each do |member|
           availid = member.id
           name = member.name
-          if search.all? { |part| availid.include? part or 
name.downcase().include? part }
+          names = name.downcase().split(' ') # N.B. split parameter is 
required by Javascript
+          if search.any? { |part| names.include? part or availid == part}
             _li do
               _input type: :radio, name: 'search', id: availid, onClick: 
lambda {
                 @availid = availid
                 @filename = availid
                 @disabled = false
               }
-              _label name, for: availid
+              _label name + " (#{availid})", for: availid
             end
           end
         end
@@ -74,9 +75,9 @@ class EmeritusRequest < Vue
 
       _table.form do
         _tr do
-          _th 'File Name'
+          _th 'ASF id (used for file name)'
           _td do
-            _input type: :text, name: 'filename', value: @filename, required: 
true, disabled: @filed,
+            _input type: :text, name: 'filename', value: @filename, required: 
true, disabled: @filed || @availid.empty?,
                    pattern: '[a-zA-Z][-\w]+(\.[a-z]+)?'
           end
         end