ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team/ZwiiCMS
10
9
Fork 3
Code Releases 154 Activity

fix user edit comment

Browse Source
This commit is contained in:
Fred Tempez 2023-10-06 09:52:38 +02:00
parent eea5e43149
commit 6c39349989
3 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -3,6 +3,7 @@
## Version 13.0.04 ## Version 13.0.04
# Corrections # Corrections
- Corrige un bug de sécurité. Lorsqu'un profil dispose des droits d'accès au gestionnaire de fichiers et qu'aucun dossier est sélectionné, la racine du site était affichée. - Corrige un bug de sécurité. Lorsqu'un profil dispose des droits d'accès au gestionnaire de fichiers et qu'aucun dossier est sélectionné, la racine du site était affichée.
- Corrige un problème d'affichage des commentaires des profils dans l'édition d'un compte.
- Erreur d'édition d'un profil de niveau 1, exemple membre simple. - Erreur d'édition d'un profil de niveau 1, exemple membre simple.
- Le profil de membre simple affichait le gestionnaire de fichiers dans tous les cas. - Le profil de membre simple affichait le gestionnaire de fichiers dans tous les cas.
- Importation d'utilisateurs en masse, le bouton de téléchargement d'un modèle était inopérant. - Importation d'utilisateurs en masse, le bouton de téléchargement d'un modèle était inopérant.

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

@ -82,7 +82,7 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col12"> <div class="col6 offset3">
<div class="block"> <div class="block">
<h4> <h4>
<?php echo helper::translate('Permissions'); ?> <?php echo helper::translate('Permissions'); ?>

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

@ -37,7 +37,7 @@
<div class="col6"> <div class="col6">
<?php echo template::text('userEditLastname', [ <?php echo template::text('userEditLastname', [
'autocomplete' => 'off', 'autocomplete' => 'off',
'disabled' => $this->getUser('group') > self::GROUP_EDITOR ? false : true, 'disabled' => $this->getUser('group') > self::GROUP_EDITOR ? false : true,
'label' => 'Nom', 'label' => 'Nom',
'value' => $this->getData(['user', $this->getUrl(2), 'lastname']) 'value' => $this->getData(['user', $this->getUrl(2), 'lastname'])
]); ?> ]); ?>
@ -98,13 +98,13 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col12"> <div class="col6 offset3">
<div class="block"> <div class="block">
<h4> <h4>
<?php echo helper::translate('Permissions'); ?> <?php echo helper::translate('Permissions'); ?>
</h4> </h4>
<div class="row"> <div class="row">
<div class="col6"> <div class="col12">
<?php if ($this->getUser('group') === self::GROUP_ADMIN): ?> <?php if ($this->getUser('group') === self::GROUP_ADMIN): ?>
<?php echo template::select('userEditGroup', self::$groupEdits, [ <?php echo template::select('userEditGroup', self::$groupEdits, [
'disabled' => ($this->getUrl(2) === $this->getUser('id')), 'disabled' => ($this->getUrl(2) === $this->getUser('id')),
@ -112,19 +112,21 @@
'label' => 'Groupe', 'label' => 'Groupe',
'selected' => $this->getData(['user', $this->getUrl(2), 'group']), 'selected' => $this->getData(['user', $this->getUrl(2), 'group']),
]); ?> ]); ?>
<?php else: ?>
<?php echo template::hidden('userEditGroup', [
'value' => $this->getData(['user', $this->getUrl(2), 'group'])
]); ?>
<?php endif; ?> <?php endif; ?>
</div> </div>
<div class="col6"> <div class="col12">
<div class="userEditGroupProfil displayNone" <div class="userEditGroupProfil" id="userEditGroupProfil<?php echo self::GROUP_MEMBER; ?>">
id="userEditGroupProfil<?php echo self::GROUP_MEMBER; ?>">
<?php echo template::select('userEditProfil' . self::GROUP_MEMBER, $module::$userProfils[self::GROUP_MEMBER], [ <?php echo template::select('userEditProfil' . self::GROUP_MEMBER, $module::$userProfils[self::GROUP_MEMBER], [
'label' => 'Profil', 'label' => 'Profil',
'selected' => $this->getData(['user', $this->getUrl(2), 'profil']), 'selected' => $this->getData(['user', $this->getUrl(2), 'profil']),
'disabled' => $this->getUser('group') !== self::GROUP_ADMIN, 'disabled' => $this->getUser('group') !== self::GROUP_ADMIN,
]); ?> ]); ?>
</div> </div>
<div class="userEditGroupProfil displayNone" <div class="userEditGroupProfil" id="userEditGroupProfil<?php echo self::GROUP_EDITOR; ?>">
id="userEditGroupProfil<?php echo self::GROUP_EDITOR; ?>">
<?php echo template::select('userEditProfil' . self::GROUP_EDITOR, $module::$userProfils[self::GROUP_EDITOR], [ <?php echo template::select('userEditProfil' . self::GROUP_EDITOR, $module::$userProfils[self::GROUP_EDITOR], [
'label' => 'Profil', 'label' => 'Profil',
'selected' => $this->getData(['user', $this->getUrl(2), 'profil']), 'selected' => $this->getData(['user', $this->getUrl(2), 'profil']),
@ -134,33 +136,33 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col12"> <div id="userCommentProfil<?php echo self::GROUP_MEMBER; ?>" class="col12 userCommentProfil">
<div id="userCommentProfil<?php echo self::GROUP_MEMBER; ?>" <?php echo template::textarea('userEditProfilComment' . self::GROUP_MEMBER, [
class="col12 userCommentProfil"> 'label' => 'Commentaire',
<?php echo template::textarea('userEditProfilComment' . self::GROUP_MEMBER, [ 'value' => implode("\n", $module::$userProfilsComments[self::GROUP_MEMBER]),
"value" => implode("\n", $module::$userProfilsComments[self::GROUP_MEMBER]), 'disabled' => true,
'disabled' => $this->getUser('group') !== self::GROUP_ADMIN,
]); ]);
?> ?>
</div>
<div id="userCommentProfil<?php echo self::GROUP_EDITOR; ?>"
class="col12 userCommentProfil">
<?php echo template::textarea('userEditProfilComment' . self::GROUP_EDITOR, [
"value" => implode("\n", $module::$userProfilsComments[self::GROUP_EDITOR]),
'disabled' => $this->getUser('group') !== self::GROUP_ADMIN,
]);
?>
</div>
<div id="userCommentProfil<?php echo self::GROUP_ADMIN; ?>"
class="col12 userCommentProfil">
<?php echo template::textarea('userEditProfilComment' . self::GROUP_ADMIN, [
'label' => 'Commentaire',
"value" => implode("\n", $module::$userProfilsComments[self::GROUP_ADMIN]),
'disabled' => $this->getUser('group') !== self::GROUP_ADMIN,
]);
?>
</div>
</div> </div>
<div id="userCommentProfil<?php echo self::GROUP_EDITOR; ?>" class="col12 userCommentProfil">
<?php echo template::textarea('userEditProfilComment' . self::GROUP_EDITOR, [
'label' => 'Commentaire',
'value' => implode("\n", $module::$userProfilsComments[self::GROUP_EDITOR]),
'disabled' => true,
]);
?>
</div>
<div id="userCommentProfil<?php echo self::GROUP_ADMIN; ?>" class="col12 userCommentProfil">
<?php echo template::textarea('userEditProfilComment' . self::GROUP_ADMIN, [
'label' => 'Commentaire',
'value' => implode("\n", $module::$userProfilsComments[self::GROUP_ADMIN]),
'disabled' => true,
]);
?>
</div>
</div> </div>
</div> </div>
</div> </div>