Skip to content

AMP-31110: issues in admin #4476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brianbrix wants to merge 2 commits into
base: develop
Choose a base branch
from
+23 −9
Open

AMP-31110: issues in admin #4476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b363dcd
AMP-31110: issues in admin
brianbrix May 17, 2026
251e303
AMP-31110: issues in admin
brianbrix May 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions amp/src/main/java/org/dgfoundation/amp/permissionmanager/web/PMUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,17 @@ public static void deletePermissionMap(PermissionMap permissionMap, Session sess
//we delete the old permissions, if they are dedicated
if (p!=null && p.isDedicated()) {
CompositePermission cp = (CompositePermission)p;
Iterator<Permission> i = cp.getPermissions().iterator();
while (i.hasNext()) {
Permission element = (Permission) i.next();
List<Permission> toDelete = new ArrayList<>(cp.getPermissions());
cp.getPermissions().clear();
for (Permission element : toDelete) {
// Remove from every CompositePermission that references this element so
// Hibernate does not attempt to re-save a deleted object via cascade on flush
Iterator<CompositePermission> linkedIt = element.getCompositeLinkedPermissions().iterator();
while (linkedIt.hasNext()) {
CompositePermission linkedCp = linkedIt.next();
linkedCp.getPermissions().remove(element);
linkedIt.remove();
}
Object object = session.load(Permission.class, element.getId());
session.delete(object);
}
Expand All @@ -189,11 +197,17 @@ public static void deletePermissionMap(PermissionMap permissionMap, Session sess


public static void deleteCompositePermission(CompositePermission cp, Session session, boolean delCompositePermission) {
// TODO Auto-generated method stub
//session.flush();
Iterator<Permission> i = cp.getPermissions().iterator();
while (i.hasNext()) {
Permission element = (Permission) i.next();
List<Permission> toDelete = new ArrayList<>(cp.getPermissions());
cp.getPermissions().clear();
for (Permission element : toDelete) {
// Remove from every CompositePermission that references this element so
// Hibernate does not attempt to re-save a deleted object via cascade on flush
Iterator<CompositePermission> linkedIt = element.getCompositeLinkedPermissions().iterator();
while (linkedIt.hasNext()) {
CompositePermission linkedCp = linkedIt.next();
linkedCp.getPermissions().remove(element);
linkedIt.remove();
}
Object object = session.load(Permission.class, element.getId());
session.delete(object);
}
Expand Down
2 changes: 1 addition & 1 deletion amp/src/main/webapp/WEB-INF/jsp/help/view/helpTopics.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ if (typeof DOMParser == "undefined") {

var id = document.getElementById("treeboxbox_tree");
tree = new dhtmlXTreeObject(id,"100%","100%",0);
tree.setImagePath("../../jsp/help/view/images/csh_vista/");
tree.setImagePath("<%=request.getContextPath()%>/resources/images/jsp/help/view/images/csh_vista/");
tree.enableTreeImages(false);
<digi:secure group="Help Administrators">
tree.enableDragAndDrop(true);
Expand Down
Loading