From 3d95cc405fc544e57870dd446a73d73b792da1cb Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Mon, 29 Jul 2019 17:13:40 +0100
Subject: [PATCH] FIX get primaryGroup from redirected baskets + wording
processDocument
---
.../class/class_modules_tools_Abstract.php | 22 ++-----------------
.../list/list-administration.component.ts | 2 +-
2 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/modules/entities/class/class_modules_tools_Abstract.php b/modules/entities/class/class_modules_tools_Abstract.php
index 180b102210e..dc8df773dc6 100755
--- a/modules/entities/class/class_modules_tools_Abstract.php
+++ b/modules/entities/class/class_modules_tools_Abstract.php
@@ -848,16 +848,7 @@ abstract class entities_Abstract extends functions
}
for ($i = 0; $i < count($baskAbs); $i ++) {
if ($baskAbs[$i]['abs_basket']) {
- $stmt = $db->query(
- "select uc.group_id from " . USERGROUP_CONTENT_TABLE
- . " uc , " . USERGROUPS_TABLE . " u where uc.user_id = ? and u.group_id = "
- . "uc.group_id and u.enabled= 'Y' and "
- . "uc.primary_group = 'Y'",
- array($baskAbs[$i]['basket_owner'])
- );
- //$db->show();
- $res = $stmt->fetchObject();
- $primaryGroup = $res->group_id;
+ $primaryGroup = $baskAbs[$i]['group_id'];
$tmpBasketId = preg_replace(
'/_' . $baskAbs[$i]['basket_owner'] . '$/',
'',
@@ -904,16 +895,7 @@ abstract class entities_Abstract extends functions
}
for ($i = 0; $i < count($baskAbs); $i ++) {
if ($baskAbs[$i]['abs_basket']) {
- $stmt = $db->query(
- "select uc.group_id from " . USERGROUP_CONTENT_TABLE
- . " uc , " . USERGROUPS_TABLE . " u where uc.user_id = ? and u.group_id = "
- . "uc.group_id and u.enabled= 'Y' and "
- . "uc.primary_group = 'Y'",
- array($baskAbs[$i]['basket_owner'])
- );
- //$db->show();
- $res = $stmt->fetchObject();
- $primaryGroup = $res->group_id;
+ $primaryGroup = $baskAbs[$i]['group_id'];
$tmpBasketId = preg_replace(
'/_' . $baskAbs[$i]['basket_owner'] . '$/',
'',
diff --git a/src/frontend/app/administration/basket/list/list-administration.component.ts b/src/frontend/app/administration/basket/list/list-administration.component.ts
index e71dfc53c81..195d7bd5cce 100644
--- a/src/frontend/app/administration/basket/list/list-administration.component.ts
+++ b/src/frontend/app/administration/basket/list/list-administration.component.ts
@@ -140,7 +140,7 @@ export class ListAdministrationComponent implements OnInit {
},
{
id: 'eventProcessDoc',
- value: 'processDoc'
+ value: 'processDocument'
},
{
id: 'eventViewDoc',
--
GitLab