# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1587525813 -32400
# Node ID 5c9b7add02e9ee36cddbf505eed9b0ecf562f891
# Parent  86058f1bf9fa414188ff1cb676a0837da26992f8
Username search in group-home should carry grid parameter

diff -r 86058f1bf9fa -r 5c9b7add02e9 s4-funcs.sh
--- a/s4-funcs.sh	Wed Apr 22 07:55:48 2020 +0900
+++ b/s4-funcs.sh	Wed Apr 22 12:23:33 2020 +0900
@@ -2207,6 +2207,7 @@
   fi
   if [ -n "$2" ]; then
     cond="where nick like '%$2%' or b.name like '%$2%'"
+    kwd=$2
   fi
 
   # XX: これ複雑すぎるかな。もっとシンプルにしたい。$3条件も。2015-07-08
@@ -2274,9 +2275,10 @@
   METHOD=GET
   if [ $total -gt $limit ]; then
     echo '<div class="right">'
-    cgi_form $stage <<EOF
+    METHOD=GET cgi_form $stage <<EOF
 <label>次の語を含む${entity}で検索:
-`cgi_text kwd $kwd`</label>
+`cgi_text kwd "$kwd"`</label>
+$hiddens
 EOF
     echo '</div>'
   fi
@@ -2509,7 +2511,7 @@
   getgname="(select gname from grp where rowid=$rowid)"
   c="group by a.name having a.name in (select user from grp_mem where gname=$getgname)"
   cm="?commission+$rowid"
-  thumbxy=50x50 listmember "" "$c" "$rowid" \
+  thumbxy=50x50 listmember "`getpar kwd`" "$c" "$rowid" \
       |sed -e "s|\(<br>\)(,not=\(.*\))|\1|"	# 間違って押しやすい
   # team list
   hexteams=`hexteams "$grp"`