This is an automated email from the ASF dual-hosted git repository.
jleroux 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 9e7df96 Improved: Move 'SecurityPermission' data to seed data files
(OFBIZ-10575) (#225)
9e7df96 is described below
commit 9e7df96921e722ceed6181bb9faad54d0ea8dc49
Author: Priya Sharma <[email protected]>
AuthorDate: Tue Aug 11 19:31:18 2020 +0530
Improved: Move 'SecurityPermission' data to seed data files (OFBIZ-10575)
(#225)
Co-authored-by: Priya Sharma <[email protected]>
---
applications/datamodel/data/demo/HumanresDemoData.xml | 1 -
applications/datamodel/data/seed/HumanResSeedData.xml | 4 +++-
framework/security/data/SecurityGroupDemoData.xml | 1 -
framework/security/data/SecurityPermissionSeedData.xml | 1 +
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/applications/datamodel/data/demo/HumanresDemoData.xml
b/applications/datamodel/data/demo/HumanresDemoData.xml
index 39c8650..085438b 100644
--- a/applications/datamodel/data/demo/HumanresDemoData.xml
+++ b/applications/datamodel/data/demo/HumanresDemoData.xml
@@ -64,7 +64,6 @@ under the License.
<UserLoginSecurityGroup groupId="HUMANRES_APPROVER"
userLoginId="demoapprover" fromDate="2001-01-01 12:00:00.0"/>
<UserLogin userLoginId="demoemployee"
currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a"
requirePasswordChange="N" partyId="DemoEmployee"/>
- <SecurityPermission description="Employee can check the status of his
requests and trainings assigned to him with this permission."
permissionId="EMPLOYEE_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0"
groupId="HUMANRES_EMPLOYEE" permissionId="EMPLOYEE_VIEW"/>
<UserLoginSecurityGroup groupId="HUMANRES_EMPLOYEE"
userLoginId="demoemployee" fromDate="2001-01-01 12:00:00.0"/>
diff --git a/applications/datamodel/data/seed/HumanResSeedData.xml
b/applications/datamodel/data/seed/HumanResSeedData.xml
index ffa3f99..2099be1 100644
--- a/applications/datamodel/data/seed/HumanResSeedData.xml
+++ b/applications/datamodel/data/seed/HumanResSeedData.xml
@@ -160,5 +160,7 @@ under the License.
<PerfRatingType perfRatingTypeId="5" hasTable="N"
description="Consistently Exceeds"/>
<!-- Public Holiday -->
- <WorkEffortType workEffortTypeId="PUBLIC_HOLIDAY" description="Public
Holiday" hasTable="N"/>
+ <WorkEffortType workEffortTypeId="PUBLIC_HOLIDAY" description="Public
Holiday" hasTable="N"/>
+
+ <SecurityPermission description="Employee can check the status of his
requests and trainings assigned to him with this permission."
permissionId="EMPLOYEE_VIEW"/>
</entity-engine-xml>
diff --git a/framework/security/data/SecurityGroupDemoData.xml
b/framework/security/data/SecurityGroupDemoData.xml
index bd903bc..13414fa 100644
--- a/framework/security/data/SecurityGroupDemoData.xml
+++ b/framework/security/data/SecurityGroupDemoData.xml
@@ -28,7 +28,6 @@ under the License.
<SecurityGroup groupId="IMPERSONATION" description="Permission group to
impersonate user."/>
<!-- general admin tools permission -->
- <SecurityPermission description="Permission to access the Stock OFBiz
Manager Applications." permissionId="OFBTOOLS_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0"
groupId="FULLADMIN" permissionId="OFBTOOLS_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0"
groupId="FLEXADMIN" permissionId="OFBTOOLS_VIEW"/>
<SecurityGroupPermission fromDate="2001-05-13 12:00:00.0"
groupId="VIEWADMIN" permissionId="OFBTOOLS_VIEW"/>
diff --git a/framework/security/data/SecurityPermissionSeedData.xml
b/framework/security/data/SecurityPermissionSeedData.xml
index aefdc58..4052610 100644
--- a/framework/security/data/SecurityPermissionSeedData.xml
+++ b/framework/security/data/SecurityPermissionSeedData.xml
@@ -29,6 +29,7 @@ under the License.
<SecurityPermission permissionId="update" description="Base UPDATE
permission"/>
<SecurityPermission permissionId="delete" description="Base DELETE
permission"/>
<SecurityPermission permissionId="OFBTOOLS_VIEW" description="Permission
to access the Stock OFBiz Manager Applications."/>
+ <SecurityPermission description="Permission to access the Stock OFBiz
Manager Applications." permissionId="OFBTOOLS_VIEW"/>
<!-- normally only permissions in this file, however permission group
SUPER is an exception -->
<SecurityGroup groupId="SUPER" description="Super admin group, has all
*_ADMIN permission loaded as seed data" groupName="Super"/>
