This is an automated email from the ASF dual-hosted git repository.
dixitdeepak pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 281f31bed0 Removed unused partyId from security related screens
(OFBIZ-13418)
281f31bed0 is described below
commit 281f31bed0c59169fec7f95013c4afd1d3bd5645
Author: Deepak Dixit <[email protected]>
AuthorDate: Tue May 26 17:52:20 2026 +0530
Removed unused partyId from security related screens (OFBIZ-13418)
---
framework/common/servicedef/services.xml | 1 -
framework/common/widget/SecurityForms.xml | 16 ++--------------
framework/common/widget/SecurityScreens.xml | 1 -
.../ofbiz/webapp/control/ControlEventListener.java | 6 +++++-
4 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/framework/common/servicedef/services.xml
b/framework/common/servicedef/services.xml
index 0d7ce44938..35d491c582 100644
--- a/framework/common/servicedef/services.xml
+++ b/framework/common/servicedef/services.xml
@@ -169,7 +169,6 @@ under the License.
<required-permissions join-type="AND"><check-permission
permission="PERIOD_MAINT"/></required-permissions>
<auto-attributes mode="OUT" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
- <attribute name="organizationPartyId" type="String" mode="IN"
optional="false"/><!-- FIXME: Framework dependency on Party component -->
<override name="fromDate" optional="false"/>
<override name="thruDate" optional="false"/>
<override name="periodTypeId" optional="false"/>
diff --git a/framework/common/widget/SecurityForms.xml
b/framework/common/widget/SecurityForms.xml
index fb40b4052d..40a91904e2 100644
--- a/framework/common/widget/SecurityForms.xml
+++ b/framework/common/widget/SecurityForms.xml
@@ -69,7 +69,6 @@ under the License.
<form name="AddUserLogin" type="single" target="${createUserLoginURI}"
focus-field-name="userLoginId" header-row-style="header-row"
default-table-style="basic-table">
<auto-fields-service service-name="createUserLogin"/>
- <field name="partyId"><hidden/></field>
<field name="enabled"><hidden/></field>
<field name="currentPassword" required-field="true"><password/></field>
<field name="currentPasswordVerify"
required-field="true"><password/></field>
@@ -81,16 +80,13 @@ under the License.
</field>
<field name="submitButton" title="${uiLabelMap.CommonSave}"
widget-style="smallSubmit"><submit button-type="text-link"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink description="${uiLabelMap.CommonCancelDone}"
target="${cancelPage}" also-hidden="false">
- <parameter param-name="partyId"/>
- </hyperlink>
+ <hyperlink description="${uiLabelMap.CommonCancelDone}"
target="${cancelPage}" also-hidden="false"/>
</field>
</form>
<form name="AddUserLoginSecurityGroup" type="single"
target="${addUserLoginSecurityGroupURI}"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="addUserLoginToSecurityGroup"/>
- <field name="partyId"><hidden value="${partyId}"/></field>
<field name="userLoginId"><hidden/></field>
<field name="groupId" title="${uiLabelMap.CommonGroup}">
<drop-down allow-empty="false">
@@ -116,9 +112,7 @@ under the License.
<field name="description"
title="${uiLabelMap.CommonDescription}"><text size="60"
maxlength="250"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}"><submit
button-type="button"/></field>
<field name="cancelLink" title=" " widget-style="smallSubmit">
- <hyperlink description="${uiLabelMap.CommonCancelDone}"
target="${cancelPage}" also-hidden="false">
- <parameter param-name="partyId"/>
- </hyperlink>
+ <hyperlink description="${uiLabelMap.CommonCancelDone}"
target="${cancelPage}" also-hidden="false"/>
</field>
</form>
@@ -235,7 +229,6 @@ under the License.
<order-by field-name="groupId"/>
</entity-condition>
</actions>
- <field name="partyId"><hidden value="${partyId}"/></field>
<field name="groupIdCol" title="${uiLabelMap.CommonSecurityGroupId}"
widget-style="buttontext">
<hyperlink description="${groupId}" target="EditSecurityGroup">
<parameter param-name="groupId"/>
@@ -250,7 +243,6 @@ under the License.
<field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit
button-type="button"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink description="${uiLabelMap.CommonExpire}"
target="${expireUserLoginSecurityGroupURI}" also-hidden="false">
- <parameter param-name="partyId"/>
<parameter param-name="userLoginId"/>
<parameter param-name="groupId"/>
<parameter param-name="fromDate"/>
@@ -268,7 +260,6 @@ under the License.
<set field="passwordHint" from-field="editUserLogin.passwordHint"/>
</actions>
<auto-fields-service service-name="updatePassword"/>
- <field name="partyId"><hidden/></field>
<field name="userLoginId"><hidden/></field>
<field name="currentPassword"><password/></field>
<field name="newPassword"><password/></field>
@@ -277,7 +268,6 @@ under the License.
<field name="cancelLink" title=" " widget-style="smallSubmit">
<hyperlink description="${uiLabelMap.CommonCancelDone}"
target="${cancelPage}" also-hidden="false">
<parameter param-name="userLoginId"/>
- <parameter param-name="partyId"/>
</hyperlink>
</field>
</form>
@@ -288,7 +278,6 @@ under the License.
<property-to-field field="ldapEnabled" resource="security"
property="security.ldap.enable"/>
</actions>
<auto-fields-service service-name="updateUserLoginSecurity"/>
- <field name="partyId"><hidden/></field>
<field name="userLoginId"><hidden/></field>
<field name="userLdapDn"
use-when=""true".equals(ldapEnabled)"><text/></field>
<field name="userLdapDn"
use-when="!"true".equals(ldapEnabled)"><ignored/></field>
@@ -296,7 +285,6 @@ under the License.
<field name="cancelLink" title=" " widget-style="smallSubmit">
<hyperlink description="${uiLabelMap.CommonCancelDone}"
target="${cancelPage}" also-hidden="false">
<parameter param-name="userLoginId"/>
- <parameter param-name="partyId"/>
</hyperlink>
</field>
</form>
diff --git a/framework/common/widget/SecurityScreens.xml
b/framework/common/widget/SecurityScreens.xml
index c2a318b687..fb9ebc37c4 100644
--- a/framework/common/widget/SecurityScreens.xml
+++ b/framework/common/widget/SecurityScreens.xml
@@ -48,7 +48,6 @@ under the License.
<set field="titleProperty" value="CreateUserLogin"/>
<set field="cancelPage" from-field="parameters.CANCEL_PAGE"
default-value="FindUserLogin"/>
<set field="createUserLoginURI" value="createUserLogin"/>
- <set field="partyId" from-field="parameters.partyId"/>
</actions>
<widgets>
<decorator-screen name="SecurityDecorator"
location="${parameters.securityDecoratorLocation}">
diff --git
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
index 310fa47a3e..9142d2d72e 100644
---
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
+++
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java
@@ -34,6 +34,7 @@ import org.apache.ofbiz.base.util.UtilValidate;
import org.apache.ofbiz.entity.Delegator;
import org.apache.ofbiz.entity.GenericEntityException;
import org.apache.ofbiz.entity.GenericValue;
+import org.apache.ofbiz.entity.model.ModelEntity;
import org.apache.ofbiz.entity.serialize.XmlSerializer;
import org.apache.ofbiz.entity.transaction.TransactionUtil;
import org.apache.ofbiz.entity.util.EntityQuery;
@@ -155,7 +156,10 @@ public class ControlEventListener implements
HttpSessionListener {
Debug.logInfo("--------------------------------------------------------------------",
MODULE);
if (visit != null) {
Debug.logInfo("Visit ID : " +
visit.getString("visitId"), MODULE);
- Debug.logInfo("Party ID : " +
visit.getString("partyId"), MODULE);
+ ModelEntity modelVisit = visit.getModelEntity();
+ if (modelVisit.isField("partyId")) {
+ Debug.logInfo("Party ID : " +
visit.getString("partyId"), MODULE);
+ }
Debug.logInfo("Client IP : " +
visit.getString("clientIpAddress"), MODULE);
Debug.logInfo("Client Host : " +
visit.getString("clientHostName"), MODULE);
Debug.logInfo("Client User : " +
visit.getString("clientUser"), MODULE);
