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

Some small bugfixes for import

deploy_packages_to_gitea
Jens Pelzetter 2023-02-22 20:02:33 +01:00
parent b5761464eb
commit 9184050986
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-cms/package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "@librecms/ccm-cms",
"version": "7.0.0-SNAPSHOT.2023-02-18T145938",
"version": "7.0.0-SNAPSHOT.2023-02-22T184921",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "@librecms/ccm-cms",
"version": "7.0.0-SNAPSHOT.2023-02-18T145938",
"version": "7.0.0-SNAPSHOT.2023-02-22T184921",
"license": "LGPL-3.0-or-later",
"dependencies": {
"@tiptap/core": "^2.0.0-beta.127",

2
ccm-cms/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@librecms/ccm-cms",
"version": "7.0.0-SNAPSHOT.2023-02-18T145938",
"version": "7.0.0-SNAPSHOT.2023-02-22T184921",
"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",

1
ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionImExporter.java
View File

@ -51,6 +51,7 @@ public class ContentSectionImExporter
addRequiredEntities(
Set.of(
Category.class,
Folder.class,
ResourceType.class,
LifecycleDefinition.class,
Workflow.class

6
ccm-cms/src/main/java/org/librecms/contentsection/Folder.java
View File

@ -321,9 +321,11 @@ public class Folder extends Category implements Serializable {
@JoinTable(
name = "FOLDER_CONTENT_SECTION_MAP", schema = DB_SCHEMA,
inverseJoinColumns = {
@JoinColumn(name = "CONTENT_SECTION_ID")},
@JoinColumn(name = "CONTENT_SECTION_ID")
},
joinColumns = {
@JoinColumn(name = "FOLDER_ID")}
@JoinColumn(name = "FOLDER_ID")
}
)
@JsonIdentityReference(alwaysAsId = true)
private ContentSection section;