From 606fa2d3245daa6d393f8773828a34f3389d4d6a Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Tue, 25 Apr 2017 16:14:00 +0100
Subject: [PATCH] FEAT #5454 new chosen
---
.../admin/users/users_management_controler.php | 10 +++-------
apps/maarch_entreprise/lang/fr.php | 2 +-
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/apps/maarch_entreprise/admin/users/users_management_controler.php b/apps/maarch_entreprise/admin/users/users_management_controler.php
index 59a97839ae0..447a731ef81 100644
--- a/apps/maarch_entreprise/admin/users/users_management_controler.php
+++ b/apps/maarch_entreprise/admin/users/users_management_controler.php
@@ -33,7 +33,7 @@ try{
include_once "core/class/class_request.php";
include_once "apps".DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_list_show.php";
}
- if ($mode == 'del' || $mode == 'up' && $entities_loaded) {
+ if (in_array($mode, ['del', 'up', 'add']) && $entities_loaded) {
include_once "modules/entities/class/EntityControler.php";
}
@@ -336,7 +336,6 @@ function display_list()
function display_del($user_id)
{
$uc = new users_controler();
-
// information liste(s) de diffusion exists in users
$listDiffusion=array();
@@ -357,9 +356,6 @@ function display_del($user_id)
<?php exit();
}
-
-
-
$user = $uc->get($user_id);
if (isset($user)) {
// Deletion
@@ -470,7 +466,7 @@ function display_del_check($user_id)
?>
<br>
<br>
- <select name="user_id" id="user_id" onchange=''>
+ <select name="user_id" id="user_id" data-placeholder="<?php echo _CHOOSE_USER2 ;?>">
<option value="no_user"><?php echo _NO_REPLACEMENT;?></option>
<?php
$stmt = $db->query("select * from users order by user_id ASC");
@@ -490,7 +486,7 @@ function display_del_check($user_id)
</p>
</form>
</div>
- <script type="text/javascript"></script>
+ <script type="text/javascript">new Chosen($('user_id'),{width: "auto", disable_search_threshold: 10, search_contains: true, allow_single_deselect: true});</script>
<?php
exit();
}
diff --git a/apps/maarch_entreprise/lang/fr.php b/apps/maarch_entreprise/lang/fr.php
index 10c9f02d0f2..912f6e52388 100755
--- a/apps/maarch_entreprise/lang/fr.php
+++ b/apps/maarch_entreprise/lang/fr.php
@@ -153,7 +153,7 @@ if (!defined("_WARNING_MESSAGE_UPDATE_USER"))
define("_WARNING_MESSAGE_UPDATE_USER", "Avertissement :<br>Afin de garder la confidentialité des courriers en cours de traitement du service, il est recommandé de réaffecter ceux-ci à un autre utilisateur :");
if (!defined("_USERS_IN_GROUPS"))
define("_USERS_IN_GROUPS", "utilisateur(s) dans le groupe");
-if (!defined("_LISTE_DIFFUSION_IN_USER")) define("_LISTE_DIFFUSION_IN_USER", "liste(s) de diffusion pour l utilisateur");
+if (!defined("_LISTE_DIFFUSION_IN_USER")) define("_LISTE_DIFFUSION_IN_USER", "liste(s) de diffusion pour l'utilisateur ");
if (!defined("_NO_REPLACEMENT")) define("_NO_REPLACEMENT", "AUCUN REMPLACEMENT");
if (!defined("_DOCS_IN_DOCTYPES")) define("_DOCS_IN_DOCTYPES", "document(s) de ce type");
if (!defined("_CHOOSE_REPLACEMENT_DOCTYPES")) define("_CHOOSE_REPLACEMENT_DOCTYPES", "Choisissez un type de document de remplacement");
--
GitLab