From 48cb16af613abc11305657faade2629603cecd33 Mon Sep 17 00:00:00 2001 From: nuxsmin Date: Thu, 1 Jun 2017 16:14:20 +0200 Subject: [PATCH] * [FIX] Related #618. Try to fix wrong behavior when retrieving customers list for the current user. Thanks to @alexanderbuhler for the feedback. --- inc/SP/Account/AccountUtil.class.php | 2 +- inc/SP/Util/Util.class.php | 4 ++-- js/app-actions.min.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/inc/SP/Account/AccountUtil.class.php b/inc/SP/Account/AccountUtil.class.php index 6bd8c9a3..18130cd7 100644 --- a/inc/SP/Account/AccountUtil.class.php +++ b/inc/SP/Account/AccountUtil.class.php @@ -269,7 +269,7 @@ class AccountUtil if (Config::getConfig()->isAccountFullGroupAccess()) { // Filtro de grupos secundarios en grupos que incluyen al usuario $filterUser[] = /** @lang SQL */ - 'account_id = (SELECT accgroup_accountId AS accountId FROM accGroups INNER JOIN usrToGroups ON usertogroup_groupId = accgroup_groupId WHERE accgroup_accountId = account_id AND usertogroup_userId = ?)'; + 'account_id = (SELECT accgroup_accountId AS accountId FROM accGroups INNER JOIN usrToGroups ON usertogroup_groupId = accgroup_groupId WHERE accgroup_accountId = account_id AND usertogroup_userId = ? LIMIT 1)'; $Data->addParam(Session::getUserData()->getUserId()); } diff --git a/inc/SP/Util/Util.class.php b/inc/SP/Util/Util.class.php index 08811817..d3285db1 100644 --- a/inc/SP/Util/Util.class.php +++ b/inc/SP/Util/Util.class.php @@ -407,8 +407,8 @@ class Util */ public static function getVersion($retBuild = false, $normalized = false) { - $build = 17053003; - $version = [2, 1, 10]; + $build = 17060101; + $version = [2, 1, 11]; if ($normalized === true) { return [implode('', $version), $build]; diff --git a/js/app-actions.min.js b/js/app-actions.min.js index 4f7f9776..fd9e3b35 100644 --- a/js/app-actions.min.js +++ b/js/app-actions.min.js @@ -1,5 +1,5 @@ var $jscomp={scope:{},findInternal:function(c,d,k){c instanceof String&&(c=String(c));for(var f=c.length,g=0;g