# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1607397090 -32400
# Node ID 610c3fb6d52aef8f00475199225c2c96f88adeaf
# Parent  380167e9cfcff84bdc14149a2c95af8cc3dd5147
Sort by uname at grpaction

diff -r 380167e9cfcf -r 610c3fb6d52a s4-funcs.sh
--- a/s4-funcs.sh	Wed Dec 02 19:10:52 2020 +0859
+++ b/s4-funcs.sh	Tue Dec 08 12:11:30 2020 +0900
@@ -3104,7 +3104,7 @@
 	  GROUP BY author
 	), teams AS (
 	  SELECT user, group_concat(val, ', ') team
-	  FROM grp_mem_m
+	  FROM mems m LEFT JOIN grp_mem_m gm ON m.name=gm.user
 	  WHERE gname=(SELECT gname FROM grp WHERE rowid=$grid)
 	  AND key='team'
 	  GROUP BY user
@@ -3121,11 +3121,13 @@
 		AND user=up.name) IS NOT NULL
 	      then 'k'
 	  ELSE ''
-	  END || rowid || ',' || gecos NAME,
+	  END || rowid || ','
+	  || rtrim(substr(name, 1, instr(name, '@')), '@') || ','
+	  || gecos NAME,
 	  post POST, team _TEAM_
 	FROM user_post up LEFT JOIN teams t
 	ON up.name=t.user
-	ORDER BY gecos;"
+	ORDER BY name;"
   ## err grpaction: "`echo \"$sql\"`"
   tf=$tmpd/title.$$
   echo "グループ[<a href=\"?grp+$grid\">$htmlgrp</a>]参加メンバーに対する操作" > $tf
@@ -3170,11 +3172,13 @@
   #b2='"> <span>' b3='</span></label>'
   #    	| sed  -e "s|^\(<TR><TD>\)k\([0-9]*\),\([^<]*\)|\1$ba\2$b2\3$b3|" \
   #	       -e "s|^\(<TR><TD>\)\([0-9]*\),\([^<]*\)|\1$b1\2$b2\3$b3|" \
-  lnk='"> <span>\3</span></label> [<a href="?home+\2">HOME</a>]'
+  lnk='"> <span>\5</span></label> [<a href="?home+\3">HOME</a>]'
+#-e "s|^\(<TR><TD>\)k\([0-9]*\),\([^<]*\)|\1$ba\2$lnk|" \
   cgi_form grpaction<<EOF \
-      	| sed  -e "s|^\(<TR><TD>\)k\([0-9]*\),\([^<]*\)|\1$ba\2$lnk|" \
-	       -e "s|^\(<TR><TD>\)\([0-9]*\),\([^<]*\)|\1$b1\2$lnk|" \
-	       -e "s|^\(<TR><TH>\)\(NAME\)|\1$br \2|" \
+      	| sed  -E \
+	       -e "s|^(<TR><TD)>(k?)([0-9]*),([^,]+),([^<]*)|\1 title=\"\4\">\2$b1\4$lnk|" \
+	       -e 's/^(<TR><TD[^>]*>)k(<label)/\1\2 class="admin"/' \
+	       -e "s|^(<TR><TH>)(NAME)|\1$br \2|" \
 	| _m4 -D_TITLE_="spaste(\`$tf')" \
 	      -D_SUBTITLE_="チェック後操作ボタン" \
 	      -D_FORM_="syscmd(cat)" -D_DUMPTABLE_="" \