From 1e97ad99138111f4a46f9f324b870d60634f2298 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sun, 16 Feb 2020 19:59:15 +0100 Subject: [PATCH] Some bugfixes --- .../java/org/librecms/contentsection/ContentSectionSetup.java | 4 +--- .../main/java/org/libreccm/security/ApplicationRoleSetup.java | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionSetup.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionSetup.java index 6532d8a17..eafb21ade 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionSetup.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionSetup.java @@ -18,7 +18,6 @@ */ package org.librecms.contentsection; -import com.arsdigita.kernel.KernelConfig; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -44,7 +43,6 @@ import org.librecms.dispatcher.MultilingualItemResolver; import java.util.Arrays; import org.librecms.contentsection.privileges.TypePrivileges; -import org.librecms.contenttypes.ContentTypeDescription; import java.util.Locale; @@ -345,7 +343,7 @@ public class ContentSectionSetup extends AbstractCcmApplicationSetup { } if (ContentItem.class.isAssignableFrom(clazz)) { - LOGGER.warn("'{}' is not is assignable from '{}'!", + LOGGER.warn("'{}' is assignable from '{}'!", ContentItem.class.getName(), clazz.getName()); final ContentType type = new ContentType(); diff --git a/ccm-core/src/main/java/org/libreccm/security/ApplicationRoleSetup.java b/ccm-core/src/main/java/org/libreccm/security/ApplicationRoleSetup.java index 56014e297..5468d15ef 100644 --- a/ccm-core/src/main/java/org/libreccm/security/ApplicationRoleSetup.java +++ b/ccm-core/src/main/java/org/libreccm/security/ApplicationRoleSetup.java @@ -21,6 +21,8 @@ package org.libreccm.security; import org.libreccm.core.CcmObject; import org.libreccm.web.AbstractCcmApplicationSetup; +import java.util.UUID; + import javax.persistence.EntityManager; /** @@ -50,6 +52,7 @@ public class ApplicationRoleSetup { private Permission createPermission(final Role role, final String privilege) { final Permission permission = new Permission(); + permission.setUuid(UUID.randomUUID().toString()); permission.setGrantedPrivilege(privilege); permission.setGrantee(role); role.addPermission(permission);