ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team
/
ZwiiCMS
3
3
Fork 2
Code Releases 145 Activity

Edit and Add to test profil

This commit is contained in:
Fred Tempez 2023-05-29 18:43:30 +02:00
parent 7c7c36a5e6
commit de84e3471b
5 changed files with 86 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/module/user/user.php
View File

@ -154,7 +154,7 @@ class user extends common
// Profils disponibles // Profils disponibles
foreach ($this->getData(['profil']) as $profilId => $profilData) { foreach ($this->getData(['profil']) as $profilId => $profilData) {
if ($profilId < self::GROUP_MEMBER ) { if ($profilId < self::GROUP_MEMBER) {
continue; continue;
} }
if ($profilId === self::GROUP_ADMIN) { if ($profilId === self::GROUP_ADMIN) {
@ -354,11 +354,17 @@ class user extends common
// Profils disponibles // Profils disponibles
foreach ($this->getData(['profil']) as $profilId => $profilData) { foreach ($this->getData(['profil']) as $profilId => $profilData) {
if ($profilId < 1 || $profilId > 2) { if ($profilId < self::GROUP_MEMBER) {
continue;
}
if ($profilId === self::GROUP_ADMIN) {
self::$userProfils[$profilId][self::GROUP_ADMIN] = $profilData['name'];
self::$userProfilsComments[$profilId][self::GROUP_ADMIN] = $profilData['comment'];
continue; continue;
} }
foreach ($profilData as $key => $value) { foreach ($profilData as $key => $value) {
self::$userProfils[$profilId][$key] = $profilData[$key]['name']; self::$userProfils[$profilId][$key] = $profilData[$key]['name'];
self::$userProfilsComments[$profilId][$key] = $profilData[$key]['name'] . ' : ' . $profilData[$key]['comment'];
} }
} }
@ -592,7 +598,7 @@ class user extends common
// Valeurs en sortie; // Valeurs en sortie;
$this->addOutput([ $this->addOutput([
'title' => sprintf(helper::translate('Éditer le profil : %s'),$this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'name'])), 'title' => sprintf(helper::translate('Éditer le profil : %s'), $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'name'])),
'view' => 'profilEdit' 'view' => 'profilEdit'
]); ]);
} }

72
core/module/user/view/add/add.js.php
View File

@ -11,40 +11,40 @@
* @link http://zwiicms.fr/ * @link http://zwiicms.fr/
*/ */
/** $(document).ready(function () {
* Affichage de l'id en simulant FILTER_ID /**
*/ * Affichage de l'id en simulant FILTER_ID
$("#userAddId").on("change keydown keyup", function(event) { */
var userId = $(this).val(); $("#userAddId").on("change keydown keyup", function (event) {
if( var userId = $(this).val();
event.keyCode !== 8 // BACKSPACE if (
&& event.keyCode !== 37 // LEFT event.keyCode !== 8 // BACKSPACE
&& event.keyCode !== 39 // RIGHT && event.keyCode !== 37 // LEFT
&& event.keyCode !== 46 // DELETE && event.keyCode !== 39 // RIGHT
&& window.getSelection().toString() !== userId // Texte sélectionné && event.keyCode !== 46 // DELETE
) { && window.getSelection().toString() !== userId // Texte sélectionné
var searchReplace = { ) {
"á": "a", "à": "a", "â": "a", "ä": "a", "ã": "a", "å": "a", "ç": "c", "é": "e", "è": "e", "ê": "e", "ë": "e", "í": "i", "ì": "i", "î": "i", "ï": "i", "ñ": "n", "ó": "o", "ò": "o", "ô": "o", "ö": "o", "õ": "o", "ú": "u", "ù": "u", "û": "u", "ü": "u", "ý": "y", "ÿ": "y", var searchReplace = {
"Á": "A", "À": "A", "Â": "A", "Ä": "A", "Ã": "A", "Å": "A", "Ç": "C", "É": "E", "È": "E", "Ê": "E", "Ë": "E", "Í": "I", "Ì": "I", "Î": "I", "Ï": "I", "Ñ": "N", "Ó": "O", "Ò": "O", "Ô": "O", "Ö": "O", "Õ": "O", "Ú": "U", "Ù": "U", "Û": "U", "Ü": "U", "Ý": "Y", "Ÿ": "Y", "á": "a", "à": "a", "â": "a", "ä": "a", "ã": "a", "å": "a", "ç": "c", "é": "e", "è": "e", "ê": "e", "ë": "e", "í": "i", "ì": "i", "î": "i", "ï": "i", "ñ": "n", "ó": "o", "ò": "o", "ô": "o", "ö": "o", "õ": "o", "ú": "u", "ù": "u", "û": "u", "ü": "u", "ý": "y", "ÿ": "y",
"'": "-", "\"": "-", " ": "-" "Á": "A", "À": "A", "Â": "A", "Ä": "A", "Ã": "A", "Å": "A", "Ç": "C", "É": "E", "È": "E", "Ê": "E", "Ë": "E", "Í": "I", "Ì": "I", "Î": "I", "Ï": "I", "Ñ": "N", "Ó": "O", "Ò": "O", "Ô": "O", "Ö": "O", "Õ": "O", "Ú": "U", "Ù": "U", "Û": "U", "Ü": "U", "Ý": "Y", "Ÿ": "Y",
}; "'": "-", "\"": "-", " ": "-"
userId = userId.replace(/[áàâäãåçéèêëíìîïñóòôöõúùûüýÿ'" ]/ig, function(match) { };
return searchReplace[match]; userId = userId.replace(/[áàâäãåçéèêëíìîïñóòôöõúùûüýÿ'" ]/ig, function (match) {
}); return searchReplace[match];
userId = userId.replace(/[^a-z0-9-]/ig, ""); });
$(this).val(userId); userId = userId.replace(/[^a-z0-9-]/ig, "");
} $(this).val(userId);
}
});
/**
* Droits des groupes
*/
$("#userAddGroup").on("change", function () {
$(".userAddGroupProfil").hide();
$(".userCommentProfil").hide();
$("#userAddGroupProfil" + $(this).val()).show();
$("#userCommentProfil" + $(this).val()).show();
}).trigger("change");
}); });
/**
* Droits des groupes
*/
$("#userAddGroup").on("change", function() {
$(".userAddGroupProfil").hide();
$(".userCommentProfil").hide();
$("#userAddGroupProfil" + $(this).val()).show();
$("#userCommentProfil" + $(this).val()).show();
}).trigger("change");

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

@ -108,25 +108,25 @@
]); ?> ]); ?>
</div> </div>
</div> </div>
<div class="row"> </div>
<div id="userCommentProfil<?php echo self::GROUP_MEMBER; ?>" class="col12 displayNone userCommentProfil"> <div class="row">
<?php echo template::textarea('useraddProfilComment' . self::GROUP_MEMBER, [ <div id="userCommentProfil<?php echo self::GROUP_MEMBER; ?>" class="col12 displayNone userCommentProfil">
"value" => implode("\n",$module::$userProfilsComments[self::GROUP_MEMBER]) <?php echo template::textarea('useraddProfilComment' . self::GROUP_MEMBER, [
]); "value" => implode("\n",$module::$userProfilsComments[self::GROUP_MEMBER])
?> ]);
</div> ?>
<div id="userCommentProfil<?php echo self::GROUP_MODERATOR; ?>" class="col12 displayNone userCommentProfil"> </div>
<?php echo template::textarea('useraddProfilComment2' . self::GROUP_MODERATOR, [ <div id="userCommentProfil<?php echo self::GROUP_MODERATOR; ?>" class="col12 displayNone userCommentProfil">
"value" => implode("\n",$module::$userProfilsComments[self::GROUP_MODERATOR]) <?php echo template::textarea('useraddProfilComment2' . self::GROUP_MODERATOR, [
]); "value" => implode("\n",$module::$userProfilsComments[self::GROUP_MODERATOR])
?> ]);
</div> ?>
<div id="userCommentProfil<?php echo self::GROUP_ADMIN; ?>" class="col12 displayNone userCommentProfil"> </div>
<?php echo template::textarea('useraddProfilComment' . self::GROUP_ADMIN, [ <div id="userCommentProfil<?php echo self::GROUP_ADMIN; ?>" class="col12 displayNone userCommentProfil">
"value" => implode("\n",$module::$userProfilsComments[self::GROUP_ADMIN]) <?php echo template::textarea('useraddProfilComment' . self::GROUP_ADMIN, [
]); "value" => implode("\n",$module::$userProfilsComments[self::GROUP_ADMIN])
?> ]);
</div> ?>
</div> </div>
</div> </div>
</div> </div>

2
core/module/user/view/edit/edit.js.php
View File

@ -18,7 +18,9 @@ $(document).ready(function () {
$("#userEditGroup").on("change", function () { $("#userEditGroup").on("change", function () {
$(".userEditGroupProfil").hide(); $(".userEditGroupProfil").hide();
$(".userCommentProfil").hide();
$("#userEditGroupProfil" + $(this).val()).show(); $("#userEditGroupProfil" + $(this).val()).show();
$("#userCommentProfil" + $(this).val()).show();
}); });
}); });

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

@ -131,6 +131,26 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div id="userCommentProfil<?php echo self::GROUP_MEMBER; ?>" class="col12 displayNone userCommentProfil">
<?php echo template::textarea('useraddProfilComment' . self::GROUP_MEMBER, [
"value" => implode("\n",$module::$userProfilsComments[self::GROUP_MEMBER])
]);
?>
</div>
<div id="userCommentProfil<?php echo self::GROUP_MODERATOR; ?>" class="col12 displayNone userCommentProfil">
<?php echo template::textarea('useraddProfilComment2' . self::GROUP_MODERATOR, [
"value" => implode("\n",$module::$userProfilsComments[self::GROUP_MODERATOR])
]);
?>
</div>
<div id="userCommentProfil<?php echo self::GROUP_ADMIN; ?>" class="col12 displayNone userCommentProfil">
<?php echo template::textarea('useraddProfilComment' . self::GROUP_ADMIN, [
"value" => implode("\n",$module::$userProfilsComments[self::GROUP_ADMIN])
]);
?>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>