# HG changeset patch # User HIROSE Yuuji # Date 1589333349 -32400 # Node ID 9c54908814be2b4df882977a9428f1ee0578d4e5 # Parent 2199d20249a8e561e7cfa98a025f2ff9aaf35477 Team selection in GrpAction anabled with js diff -r 2199d20249a8 -r 9c54908814be s4-cgi.sh --- a/s4-cgi.sh Wed May 13 07:31:26 2020 +0900 +++ b/s4-cgi.sh Wed May 13 10:29:09 2020 +0900 @@ -121,7 +121,7 @@ } cgi_select_h() { # $1=name $2...=hexed-args - echo "" shift for i; do echo "" diff -r 2199d20249a8 -r 9c54908814be s4-funcs.sh --- a/s4-funcs.sh Wed May 13 07:31:26 2020 +0900 +++ b/s4-funcs.sh Wed May 13 10:29:09 2020 +0900 @@ -2716,7 +2716,7 @@ echo "チーム名に使えない文字を除去しました" | html p team=newteam fi - if [ -z "$team" -o x"$team" = x"なし" ]; then + if [ -z "$team" -o x"$team" = x"なし" -o x"$team" = x"TEAM" ]; then cat<<-EOF | html p 有効なチーム名を入力してください。 カンマだけ、「なし」という名前は使えません。 @@ -2781,7 +2781,7 @@ then 'k' ELSE '' END || rowid || ',' || gecos NAME, - post POST, team TEAM + post POST, team _TEAM_ FROM user_post up LEFT JOIN teams t ON up.name=t.user ORDER BY gecos;" @@ -2815,6 +2815,8 @@ " fi + stf=$tmpd/selteam.$$ + cgi_select_h selteam "5445414d" $allhexteams > $stf b1='