# HG changeset patch # User HIROSE Yuuji # Date 1565856556 -32400 # Node ID dfa90fbc05bd9c8e82b061959f7ee2c6f16bf554 # Parent 1974f3bce9993d853a971c02a2a82c51fee39bb5 Group admin can edit any blog attributes. diff -r 1974f3bce999 -r dfa90fbc05bd s4-blog.sh --- a/s4-blog.sh Sat Jul 27 08:54:43 2019 +0900 +++ b/s4-blog.sh Thu Aug 15 17:09:16 2019 +0900 @@ -195,7 +195,9 @@ query<<-EOF | SELECT coalesce((SELECT "yes" FROM blog - WHERE rowid=$rowid AND author='$user'), + -- GrpAdmin CAN EDIT heading since 2019-08-15 + WHERE '$isgrpadmin' = 'true' + OR (rowid=$rowid AND author='$user')), ''), max(CASE key WHEN 'ctime' THEN val END) ctime, max(CASE key WHEN 'heading' THEN hex(val) END) heading, diff -r 1974f3bce999 -r dfa90fbc05bd s4-funcs.sh --- a/s4-funcs.sh Sat Jul 27 08:54:43 2019 +0900 +++ b/s4-funcs.sh Thu Aug 15 17:09:16 2019 +0900 @@ -3339,6 +3339,14 @@ sql="select gname from $tbl where rowid=$rowid;" ##err p2t:grp:q $sql isgrpowner "$user" "`query $sql`" && rowowner=$user + elif [ x"$tbl" = x"blog" ]; then + # Check if owner in blog_s + blogowner=`getvalbyid blog owner "$rowid"` + if isgrpowner "$user" "$blogowner"; then + rowowner=$user + else + rowowner=`query "SELECT author FROM $tbl WHERE rowid=$rowid;"` + fi else # 2016-12-05 There's no owner column in $tbl (need confirmation) rowowner=`query "SELECT author FROM $tbl WHERE rowid=$rowid;"`