lapervenche
/
ZwiiCMS
forked from ZwiiCMS-Team/ZwiiCMS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge branch '10400' into editeur

This commit is contained in:
Fred Tempez 2020-10-14 19:21:20 +02:00
parent af49404044 5c6a90c0ac
commit 0ae5d80c28
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/module/page/page.php
View File

@ -19,7 +19,7 @@ class page extends common {
public static $actions = [ public static $actions = [
'add' => self::GROUP_MODERATOR, 'add' => self::GROUP_MODERATOR,
'delete' => self::GROUP_MODERATOR, 'delete' => self::GROUP_MODERATOR,
'edit' => self::GROUP_EDITOR, 'edit' => self::GROUP_MODERATOR,
'duplicate' => self::GROUP_MODERATOR 'duplicate' => self::GROUP_MODERATOR
]; ];
public static $pagesNoParentId = [ public static $pagesNoParentId = [

1
core/module/user/view/add/add.php
View File

@ -52,7 +52,6 @@
</ul> </ul>
<ul id="userAddGroupDescription<?php echo self::GROUP_EDITOR; ?>" class="userAddGroupDescription displayNone"> <ul id="userAddGroupDescription<?php echo self::GROUP_EDITOR; ?>" class="userAddGroupDescription displayNone">
<li>Édition de pages</li> <li>Édition de pages</li>
<li>Édition des articles de blog</li>
</ul> </ul>
<ul id="userAddGroupDescription<?php echo self::GROUP_MODERATOR; ?>" class="userAddGroupDescription displayNone"> <ul id="userAddGroupDescription<?php echo self::GROUP_MODERATOR; ?>" class="userAddGroupDescription displayNone">
<li>Accès aux pages privées membres et éditeurs</li> <li>Accès aux pages privées membres et éditeurs</li>

1
core/module/user/view/edit/edit.php
View File

@ -70,7 +70,6 @@
</ul> </ul>
<ul id="userEditGroupDescription<?php echo self::GROUP_EDITOR; ?>" class="userEditGroupDescription displayNone"> <ul id="userEditGroupDescription<?php echo self::GROUP_EDITOR; ?>" class="userEditGroupDescription displayNone">
<li>Édition de pages</li> <li>Édition de pages</li>
<li>Édition des articles de blog</li>
</ul> </ul>
<ul id="userEditGroupDescription<?php echo self::GROUP_MODERATOR; ?>" class="userEditGroupDescription displayNone"> <ul id="userEditGroupDescription<?php echo self::GROUP_MODERATOR; ?>" class="userEditGroupDescription displayNone">
<li>Accès aux pages privées membres et éditeurs</li> <li>Accès aux pages privées membres et éditeurs</li>

4
module/blog/blog.php
View File

@ -86,7 +86,7 @@ class blog extends common {
public static $users = []; public static $users = [];
const BLOG_VERSION = '3.05.dev'; const BLOG_VERSION = '3.1';
/** /**
* Édition * Édition
@ -310,7 +310,7 @@ class blog extends common {
( (
$this->getData(['module', $this->getUrl(0), $value,'editConsent']) === self::EDIT_OWNER $this->getData(['module', $this->getUrl(0), $value,'editConsent']) === self::EDIT_OWNER
AND $this->getData(['module', $this->getUrl(0), $value,'userId']) === $this->getUser('id') AND $this->getData(['module', $this->getUrl(0), $value,'userId']) === $this->getUser('id')
AND $this->getUser('group') >= self::GROUP_EDITOR AND $this->getUser('group') >= self::GROUP_MODERATOR
) )
OR ( OR (