forked from ZwiiCMS-Team/ZwiiCMS
Merge branch '10400' into editeur
This commit is contained in:
commit
0ae5d80c28
@ -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 = [
|
||||||
|
@ -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>
|
||||||
|
@ -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>
|
||||||
|
@ -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 (
|
||||||
|
Loading…
Reference in New Issue
Block a user