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 11:16:24 +02:00
parent 7048cc37f4 f9eb28f6f3
commit af49404044
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
module/blog/blog.php
View File

@ -16,6 +16,7 @@ class blog extends common {
const EDIT_OWNER = 'owner'; const EDIT_OWNER = 'owner';
const EDIT_GROUP = 'group'; const EDIT_GROUP = 'group';
const EDIT_ALL = 'all';
public static $actions = [ public static $actions = [
'add' => self::GROUP_EDITOR, 'add' => self::GROUP_EDITOR,
@ -77,12 +78,12 @@ class blog extends common {
// Permissions d'un article // Permissions d'un article
public static $articleConsent = [ public static $articleConsent = [
self::EDIT_ALL => 'Tous les groupes',
self::EDIT_GROUP => 'Groupe du propriétaire', self::EDIT_GROUP => 'Groupe du propriétaire',
self::EDIT_OWNER => 'Propiétaire' self::EDIT_OWNER => 'Propiétaire'
]; ];
public static $users = []; public static $users = [];
const BLOG_VERSION = '3.05.dev'; const BLOG_VERSION = '3.05.dev';
@ -309,14 +310,18 @@ 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')
) // Ou une autorité AND $this->getUser('group') >= self::GROUP_EDITOR
OR $this->getUser('group') > $this->getData(['module',$this->getUrl(0), $value,'editConsent']) )
) OR ( OR (
// Groupe // Groupe
$this->getData(['module', $this->getUrl(0), $this->getUrl(1),'editConsent']) !== self::EDIT_OWNER $this->getData(['module', $this->getUrl(0), $value,'editConsent'])) !== self::EDIT_OWNER
AND $this->getUser('group') >= $this->getData(['module',$this->getUrl(0), $value,'editConsent']) AND $this->getUser('group') >= $this->getData(['module',$this->getUrl(0), $value,'editConsent'])
) )
OR (
// Tout le monde
$this->getData(['module', $this->getUrl(0), $value,'editConsent']) === self::EDIT_ALL
)
) { ) {
$filterData[] = $value; $filterData[] = $value;
} }
@ -697,3 +702,4 @@ class blog extends common {
} }
} }
} }

8
module/blog/view/article/article.php
View File

@ -22,7 +22,15 @@
$this->getData(['module', $this->getUrl(0), $this->getUrl(1),'editConsent']) !== $module::EDIT_OWNER $this->getData(['module', $this->getUrl(0), $this->getUrl(1),'editConsent']) !== $module::EDIT_OWNER
AND $this->getUser('group') >= $this->getData(['module',$this->getUrl(0), $this->getUrl(1),'editConsent']) AND $this->getUser('group') >= $this->getData(['module',$this->getUrl(0), $this->getUrl(1),'editConsent'])
) )
OR (
// Tout le monde
$this->getData(['module', $this->getUrl(0), $this->getUrl(1),'editConsent']) === $module::EDIT_ALL
)
): ?> ): ?>
<?php echo template::button('blogEdit', [
'href' => helper::baseUrl() . $this->getUrl(0) . '/edit/' . $this->getUrl(1) . '/' . $_SESSION['csrf'],
'value' => 'Editer'
]); ?>
<?php endif; ?> <?php endif; ?>
</div> </div>
</div> </div>