diff --git a/ccm-cms/package-lock.json b/ccm-cms/package-lock.json index b1b7a9c37..574c5749c 100644 --- a/ccm-cms/package-lock.json +++ b/ccm-cms/package-lock.json @@ -1,12 +1,12 @@ { "name": "@librecms/ccm-cms", - "version": "7.0.0-SNAPSHOT.2023-02-26T075448", + "version": "7.0.0-SNAPSHOT.2023-03-11T125333", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@librecms/ccm-cms", - "version": "7.0.0-SNAPSHOT.2023-02-26T075448", + "version": "7.0.0-SNAPSHOT.2023-03-11T125333", "license": "LGPL-3.0-or-later", "dependencies": { "@tiptap/core": "^2.0.0-beta.127", diff --git a/ccm-cms/package.json b/ccm-cms/package.json index 3eb8b2af7..80de72a67 100644 --- a/ccm-cms/package.json +++ b/ccm-cms/package.json @@ -1,6 +1,6 @@ { "name": "@librecms/ccm-cms", - "version": "7.0.0-SNAPSHOT.2023-02-26T075448", + "version": "7.0.0-SNAPSHOT.2023-03-11T125333", "description": "JavaScript stuff for ccm-cms", "main": "target/generated-resources/assets/@content-sections/cms-admin.js", "types": "target/generated-resources/assets/@content-sections/cms-admin.d.ts", diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSection.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSection.java index bea992bf8..ed5c2320c 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSection.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSection.java @@ -65,6 +65,10 @@ import static org.librecms.CmsConstants.*; @Entity @Table(name = "CONTENT_SECTIONS", schema = DB_SCHEMA) @NamedQueries({ + @NamedQuery( + name = "ContentSection.findAll", + query = "SELECT s FROM ContentSection s" + ), @NamedQuery( name = "ContentSection.findById", query = "SELECT s FROM ContentSection s WHERE s.objectId = :objectId"), @@ -253,11 +257,11 @@ public class ContentSection protected void addFolder(final Folder folder) { folders.add(folder); } - + protected void removeFolder(final Folder folder) { folders.remove(folder); } - + protected void setFolders(final Set folders) { this.folders = new HashSet<>(folders); } diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionRepository.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionRepository.java index 8c2c2f393..adf389f12 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionRepository.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionRepository.java @@ -23,6 +23,7 @@ import org.libreccm.core.CoreConstants; import org.libreccm.security.AuthorizationRequired; import org.libreccm.security.RequiresPrivilege; +import java.util.List; import java.util.Optional; import java.util.UUID; @@ -41,6 +42,13 @@ public class ContentSectionRepository private static final long serialVersionUID = 4616599498399330865L; + @Override + public List findAll() { + return getEntityManager() + .createNamedQuery("ContentSection.findAll", ContentSection.class) + .getResultList(); + } + public Optional findByUuid(final String uuid) { try { return Optional.of(