From 99770f32dc4640a8b12596f2579a4150d0e76a6f Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Wed, 22 Mar 2017 17:56:42 +0100
Subject: [PATCH] FIX #5327 remove getusersavis() from "for" loop
---
modules/avis/class/avis_controler_Abstract.php | 2 +-
modules/avis/load_listmodel_avis.php | 2 +-
modules/avis/load_listmodel_avis_popup.php | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/modules/avis/class/avis_controler_Abstract.php b/modules/avis/class/avis_controler_Abstract.php
index 6602574f569..c9ebef171a8 100755
--- a/modules/avis/class/avis_controler_Abstract.php
+++ b/modules/avis/class/avis_controler_Abstract.php
@@ -62,10 +62,10 @@ abstract class avis_controler_Abstract
$str .= '<option value="" ></option>';
$tab_userentities = $this->getEntityAvis();
+ $tab_users = $this->getUsersAvis();
//Order by parent entity
foreach ($tab_userentities as $key => $value) {
$str .= '<optgroup label="' . $tab_userentities[$key]['entity_id'] . '">';
- $tab_users = $this->getUsersAvis($tab_usergroups[$key]['group_id']);
foreach ($tab_users as $user) {
if ($tab_userentities[$key]['entity_id'] == $user['entity_id']) {
$selected = " ";
diff --git a/modules/avis/load_listmodel_avis.php b/modules/avis/load_listmodel_avis.php
index 42cdb8acfe4..d354c9ec77b 100755
--- a/modules/avis/load_listmodel_avis.php
+++ b/modules/avis/load_listmodel_avis.php
@@ -86,11 +86,11 @@ require_once "modules" . DIRECTORY_SEPARATOR . "avis" . DIRECTORY_SEPARATOR
$content .= '<option value="" >Sélectionnez un utilisateur</option>';
$tab_userentities = $avis->getEntityAvis();
+ $tab_users = $avis->getUsersAvis();
/** Order by parent entity **/
foreach ($tab_userentities as $key => $value) {
$content .= '<optgroup label="'.$tab_userentities[$key]['entity_id'].'">';
- $tab_users = $avis->getUsersAvis($tab_usergroups[$key]['group_id']);
foreach($tab_users as $user){
if($tab_userentities[$key]['entity_id'] == $user['entity_id']){
$selected = " ";
diff --git a/modules/avis/load_listmodel_avis_popup.php b/modules/avis/load_listmodel_avis_popup.php
index d06cfe63cd0..f46a27e5429 100755
--- a/modules/avis/load_listmodel_avis_popup.php
+++ b/modules/avis/load_listmodel_avis_popup.php
@@ -81,17 +81,16 @@ require_once "modules" . DIRECTORY_SEPARATOR . "avis" . DIRECTORY_SEPARATOR
$content .= '<tr ' . $color . '>';
$content .= '<td>';
- $tab_users = $avis->getUsersAvis();
$content .= '<span id="avisPopup_rank_' . $seq . '"> <span class="nbResZero" style="font-weight:bold;opacity:0.5;">'. ($seq + 1) .'</span> </span>';
$content .= '<select id="avisPopup_'.$seq.'" name="avisPopup_'.$seq.'" >';
$content .= '<option value="" >Sélectionnez un utilisateur</option>';
$tab_userentities = $avis->getEntityAvis();
+ $tab_users = $avis->getUsersAvis();
/** Order by parent entity **/
foreach ($tab_userentities as $key => $value) {
$content .= '<optgroup label="'.$tab_userentities[$key]['entity_id'].'">';
- $tab_users = $avis->getUsersAvis($tab_usergroups[$key]['group_id']);
foreach($tab_users as $user){
if($tab_userentities[$key]['entity_id'] == $user['entity_id']){
$selected = " ";
--
GitLab