s4

changeset 585:dfa90fbc05bd

find changesets by author, revision, files, or words in the commit message
Group admin can edit any blog attributes.
author HIROSE Yuuji <yuuji@gentei.org>
date Thu, 15 Aug 2019 17:09:16 +0900
parents 1974f3bce999
children a03bfd5d242a
files s4-blog.sh s4-funcs.sh
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line diff
     1.1 --- a/s4-blog.sh	Sat Jul 27 08:54:43 2019 +0900
     1.2 +++ b/s4-blog.sh	Thu Aug 15 17:09:16 2019 +0900
     1.3 @@ -195,7 +195,9 @@
     1.4  
     1.5    query<<-EOF |
     1.6  	SELECT coalesce((SELECT "yes" FROM blog
     1.7 -			 WHERE rowid=$rowid AND author='$user'),
     1.8 +			-- GrpAdmin CAN EDIT heading since 2019-08-15
     1.9 +			 WHERE '$isgrpadmin' = 'true'
    1.10 +			       OR (rowid=$rowid AND author='$user')),
    1.11  			 ''),
    1.12  	       max(CASE key WHEN 'ctime' THEN val END) ctime,
    1.13  	       max(CASE key WHEN 'heading' THEN hex(val) END) heading,

     2.1 --- a/s4-funcs.sh	Sat Jul 27 08:54:43 2019 +0900
     2.2 +++ b/s4-funcs.sh	Thu Aug 15 17:09:16 2019 +0900
     2.3 @@ -3339,6 +3339,14 @@
     2.4        sql="select gname from $tbl where rowid=$rowid;"
     2.5        ##err p2t:grp:q $sql
     2.6        isgrpowner "$user" "`query $sql`" && rowowner=$user
     2.7 +    elif [ x"$tbl" = x"blog" ]; then
     2.8 +      # Check if owner in blog_s
     2.9 +      blogowner=`getvalbyid blog owner "$rowid"`
    2.10 +      if isgrpowner "$user" "$blogowner"; then
    2.11 +	rowowner=$user
    2.12 +      else
    2.13 +	rowowner=`query "SELECT author FROM $tbl WHERE rowid=$rowid;"`
    2.14 +      fi
    2.15      else
    2.16        # 2016-12-05 There's no owner column in $tbl (need confirmation)
    2.17        rowowner=`query "SELECT author FROM $tbl WHERE rowid=$rowid;"`