Merge pull request #16 from phoenixctms/parent_user

configuration for user inheritance feature
phoenixctms · Sep 2, 2021 · 2f79892 · 2f79892
2 parents fabefc4 + b939e60
commit 2f79892
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/criterion_property_definitions.csv b/criterion_property_definitions.csv
@@ -266,6 +266,7 @@ USER_DB;user.id;LONG;;;;;;;;;user.id;EQ, NE, TRUE
 USER_DB;user.department.id;LONG;Department;;;;;;getFilterDepartments;;user.department.id;EQ, NE, IS_EQ_CONTEXT_USER_DEPARTMENT_ID
 USER_DB;user.name;STRING;;;;;;;;;user.name;EQ, NE, GT, GE, LT, LE, LIKE, ILIKE
 USER_DB;user.locked;BOOLEAN;;;;;;;;;user.locked;EQ, NE
+USER_DB;user.parent.id;LONG;;;;;;;;USER_DB;user.parent.id;EQ, NE, IS_NULL
 USER_DB;user.decrypt;BOOLEAN;;;;;;;;;user.decrypt;EQ, NE
 USER_DB;user.decryptUntrusted;BOOLEAN;;;;;;;;;user.decryptUntrusted;EQ, NE
 USER_DB;user.deferredDelete;BOOLEAN;;;;;;;;;user.deferredDelete;EQ, NE

diff --git a/criterion_property_definitions.xlsx b/criterion_property_definitions.xlsx
diff --git a/permission_definitions.csv b/permission_definitions.csv
@@ -691,6 +691,9 @@ org.phoenixctms.ctsms.service.user.UserService.setDataTableColumns;;userId;;ANY_
 org.phoenixctms.ctsms.service.user.UserService.clearDataTableColumns;;userId;;ANY_USER,USER_USER_DEPARTMENT,USER_IDENTITY_DEPARTMENT,ACTIVE_USER;;;;USER_ALL_DEPARTMENTS,USER_USER_DEPARTMENT,USER_IDENTITY_DEPARTMENT,USER_ACTIVE_USER
 org.phoenixctms.ctsms.service.user.UserService.getDataTableColumnCount;;userId;;ANY_USER,USER_USER_DEPARTMENT,USER_IDENTITY_DEPARTMENT,ACTIVE_USER;;;;USER_ALL_DEPARTMENTS,USER_USER_DEPARTMENT,USER_IDENTITY_DEPARTMENT,USER_ACTIVE_USER
 org.phoenixctms.ctsms.service.user.UserService.updateUserSettings;;modifiedSettings.getId;;ANY_USER,USER_USER_DEPARTMENT,USER_IDENTITY_DEPARTMENT,ACTIVE_USER;;;;USER_ALL_DEPARTMENTS,USER_USER_DEPARTMENT,USER_IDENTITY_DEPARTMENT,USER_ACTIVE_USER
+org.phoenixctms.ctsms.service.user.UserService.isPropertiesAncestor;;userId;;ANY_USER,USER_USER_DEPARTMENT,USER_IDENTITY_DEPARTMENT,ACTIVE_USER;;;;USER_ALL_DEPARTMENTS,USER_USER_DEPARTMENT,USER_IDENTITY_DEPARTMENT,USER_ACTIVE_USER
+org.phoenixctms.ctsms.service.user.UserService.isPermissionProfileGroupsAncestor;;userId;;ANY_USER,USER_USER_DEPARTMENT,USER_IDENTITY_DEPARTMENT,ACTIVE_USER;;;;USER_ALL_DEPARTMENTS,USER_USER_DEPARTMENT,USER_IDENTITY_DEPARTMENT,USER_ACTIVE_USER
+org.phoenixctms.ctsms.service.user.UserService.getInheritedUser;;userId;;ANY_USER;;;;USER_ACTIVE_USER:USER_ALL_DEPARTMENTS:USER_USER_DEPARTMENT:USER_IDENTITY_DEPARTMENT
 ;;;;;;;;
 org.phoenixctms.ctsms.service.shared.InputFieldService.addInputField;;;;;;;;INPUT_FIELD_MASTER
 org.phoenixctms.ctsms.service.shared.InputFieldService.addSelectionSetValue;;;;;;;;INPUT_FIELD_MASTER

diff --git a/permission_definitions.xlsx b/permission_definitions.xlsx