LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Some bugfixes 

Former-commit-id: 2b556e54bf
pull/2/head
Jens Pelzetter 2020-02-16 19:59:15 +01:00
parent 5bc2137193
commit 27c1b351f2
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionSetup.java
View File

@ -18,7 +18,6 @@
*/ */
package org.librecms.contentsection; package org.librecms.contentsection;
import com.arsdigita.kernel.KernelConfig;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@ -44,7 +43,6 @@ import org.librecms.dispatcher.MultilingualItemResolver;
import java.util.Arrays; import java.util.Arrays;
import org.librecms.contentsection.privileges.TypePrivileges; import org.librecms.contentsection.privileges.TypePrivileges;
import org.librecms.contenttypes.ContentTypeDescription;
import java.util.Locale; import java.util.Locale;
@ -345,7 +343,7 @@ public class ContentSectionSetup extends AbstractCcmApplicationSetup {
} }
if (ContentItem.class.isAssignableFrom(clazz)) { if (ContentItem.class.isAssignableFrom(clazz)) {
LOGGER.warn("'{}' is not is assignable from '{}'!", LOGGER.warn("'{}' is assignable from '{}'!",
ContentItem.class.getName(), ContentItem.class.getName(),
clazz.getName()); clazz.getName());
final ContentType type = new ContentType(); final ContentType type = new ContentType();

3
ccm-core/src/main/java/org/libreccm/security/ApplicationRoleSetup.java
View File

@ -21,6 +21,8 @@ package org.libreccm.security;
import org.libreccm.core.CcmObject; import org.libreccm.core.CcmObject;
import org.libreccm.web.AbstractCcmApplicationSetup; import org.libreccm.web.AbstractCcmApplicationSetup;
import java.util.UUID;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
/** /**
@ -50,6 +52,7 @@ public class ApplicationRoleSetup {
private Permission createPermission(final Role role, final String privilege) { private Permission createPermission(final Role role, final String privilege) {
final Permission permission = new Permission(); final Permission permission = new Permission();
permission.setUuid(UUID.randomUUID().toString());
permission.setGrantedPrivilege(privilege); permission.setGrantedPrivilege(privilege);
permission.setGrantee(role); permission.setGrantee(role);
role.addPermission(permission); role.addPermission(permission);