From 052461a3d0cc3f99b15e5c5985dac5e2f7bfe689 Mon Sep 17 00:00:00 2001
From: "j.luginger" <j.luginger@adito.de>
Date: Fri, 27 Nov 2020 07:38:41 +0100
Subject: [PATCH] [Projekt: xRM-Trade 2020][TicketNr.: 1069526][Gebiete und
Strukturen "meine Gebiete"]
---
entity/District_entity/District_entity.aod | 4 ++++
.../recordcontainers/db/conditionProcess.js | 15 ++++++++++++++-
neonView/DistrictList_view/DistrictList_view.aod | 6 ++++++
neonView/PersonMain_view/PersonMain_view.aod | 5 -----
4 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/entity/District_entity/District_entity.aod b/entity/District_entity/District_entity.aod
index a3e061e237..c22b1728ab 100644
--- a/entity/District_entity/District_entity.aod
+++ b/entity/District_entity/District_entity.aod
@@ -317,6 +317,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityParameter>
+ <name>ResponsibleDistrictsOfCurrentUser_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/District_entity/recordcontainers/db/conditionProcess.js b/entity/District_entity/recordcontainers/db/conditionProcess.js
index 8329757ab9..309e53986e 100644
--- a/entity/District_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/District_entity/recordcontainers/db/conditionProcess.js
@@ -1,8 +1,21 @@
+import("Employee_lib");
import("system.result");
import("system.vars");
import("Sql_lib");
-var onlyResponsibleParam = vars.get("$param.DistrictsByContactId_param");
+
+var responsibleDistrictsOfCurrentUser = vars.get("$param.ResponsibleDistrictsOfCurrentUser_param");
+var onlyResponsibleParam;
+if(responsibleDistrictsOfCurrentUser == "true")
+{
+ onlyResponsibleParam = EmployeeUtils.getCurrentContactId();
+
+}
+else
+{
+ onlyResponsibleParam = vars.get("$param.DistrictsByContactId_param");
+}
+
var cond = newWhere();
if (onlyResponsibleParam)
{
diff --git a/neonView/DistrictList_view/DistrictList_view.aod b/neonView/DistrictList_view/DistrictList_view.aod
index 5306a53d6e..6adf2529d0 100644
--- a/neonView/DistrictList_view/DistrictList_view.aod
+++ b/neonView/DistrictList_view/DistrictList_view.aod
@@ -14,6 +14,12 @@
<title>District</title>
</neonDashletCategory>
</categories>
+ <parameters>
+ <neonDashletParameter>
+ <name>ResponsibleDistrictsOfCurrentUser_param</name>
+ <value>true</value>
+ </neonDashletParameter>
+ </parameters>
</neonDashletConfiguration>
</dashletConfigurations>
<layout>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index 7e88568ac7..110c8c17c7 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -44,11 +44,6 @@
<entityField>#ENTITY</entityField>
<view>PersonAttributeRestriction_view</view>
</neonViewReference>
- <neonViewReference>
- <name>1f6cf193-61c3-4681-bafd-c7f9c906cdf6</name>
- <entityField>Districts</entityField>
- <view>DistrictList_view</view>
- </neonViewReference>
<neonViewReference>
<name>19a5f9ed-228d-4352-9e82-e7aa690648e9</name>
<entityField>DistrictResponsibles</entityField>
--
GitLab