s4

changeset 628:5c9b7add02e9

find changesets by author, revision, files, or words in the commit message
Username search in group-home should carry grid parameter
author HIROSE Yuuji <yuuji@gentei.org>
date Wed, 22 Apr 2020 12:23:33 +0900
parents 86058f1bf9fa
children b1ddb2559d77
files s4-funcs.sh
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line diff
     1.1 --- a/s4-funcs.sh	Wed Apr 22 07:55:48 2020 +0900
     1.2 +++ b/s4-funcs.sh	Wed Apr 22 12:23:33 2020 +0900
     1.3 @@ -2207,6 +2207,7 @@
     1.4    fi
     1.5    if [ -n "$2" ]; then
     1.6      cond="where nick like '%$2%' or b.name like '%$2%'"
     1.7 +    kwd=$2
     1.8    fi
     1.9  
    1.10    # XX: これ複雑すぎるかな。もっとシンプルにしたい。$3条件も。2015-07-08
    1.11 @@ -2274,9 +2275,10 @@
    1.12    METHOD=GET
    1.13    if [ $total -gt $limit ]; then
    1.14      echo '<div class="right">'
    1.15 -    cgi_form $stage <<EOF
    1.16 +    METHOD=GET cgi_form $stage <<EOF
    1.17  <label>次の語を含む${entity}で検索:
    1.18 -`cgi_text kwd $kwd`</label>
    1.19 +`cgi_text kwd "$kwd"`</label>
    1.20 +$hiddens
    1.21  EOF
    1.22      echo '</div>'
    1.23    fi
    1.24 @@ -2509,7 +2511,7 @@
    1.25    getgname="(select gname from grp where rowid=$rowid)"
    1.26    c="group by a.name having a.name in (select user from grp_mem where gname=$getgname)"
    1.27    cm="?commission+$rowid"
    1.28 -  thumbxy=50x50 listmember "" "$c" "$rowid" \
    1.29 +  thumbxy=50x50 listmember "`getpar kwd`" "$c" "$rowid" \
    1.30        |sed -e "s|\(<br>\)(,not=\(.*\))|\1|"	# 間違って押しやすい
    1.31    # team list
    1.32    hexteams=`hexteams "$grp"`