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

Fixed some NPEs

deploy_packages_to_gitea
Jens Pelzetter 2023-03-13 21:16:32 +01:00
parent d41a372ef3
commit cee7b5536b
4 changed files with 11 additions and 4 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", "name": "@librecms/ccm-cms",
"version": "7.0.0-SNAPSHOT.2023-03-11T125333", "version": "7.0.0-SNAPSHOT.2023-03-13T190250",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@librecms/ccm-cms", "name": "@librecms/ccm-cms",
"version": "7.0.0-SNAPSHOT.2023-03-11T125333", "version": "7.0.0-SNAPSHOT.2023-03-13T190250",
"license": "LGPL-3.0-or-later", "license": "LGPL-3.0-or-later",
"dependencies": { "dependencies": {
"@tiptap/core": "^2.0.0-beta.127", "@tiptap/core": "^2.0.0-beta.127",

2
ccm-cms/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@librecms/ccm-cms", "name": "@librecms/ccm-cms",
"version": "7.0.0-SNAPSHOT.2023-03-11T125333", "version": "7.0.0-SNAPSHOT.2023-03-13T190250",
"description": "JavaScript stuff for ccm-cms", "description": "JavaScript stuff for ccm-cms",
"main": "target/generated-resources/assets/@content-sections/cms-admin.js", "main": "target/generated-resources/assets/@content-sections/cms-admin.js",
"types": "target/generated-resources/assets/@content-sections/cms-admin.d.ts", "types": "target/generated-resources/assets/@content-sections/cms-admin.d.ts",

7
ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/DocumentUi.java
View File

@ -21,6 +21,7 @@ package org.librecms.ui.contentsections.documents;
import org.librecms.contentsection.ContentItem; import org.librecms.contentsection.ContentItem;
import org.librecms.contentsection.ContentItemManager; import org.librecms.contentsection.ContentItemManager;
import org.librecms.contentsection.ContentSection; import org.librecms.contentsection.ContentSection;
import org.librecms.ui.contentsections.ContentSectionModel;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.inject.Inject; import javax.inject.Inject;
@ -37,6 +38,9 @@ public class DocumentUi {
@Inject @Inject
private ContentItemManager itemManager; private ContentItemManager itemManager;
@Inject
private ContentSectionModel sectionModel;
/** /**
* Used to provide data for the views without a named bean. * Used to provide data for the views without a named bean.
*/ */
@ -67,6 +71,9 @@ public class DocumentUi {
) { ) {
models.put("section", section.getLabel()); models.put("section", section.getLabel());
models.put("documentPath", documentPath); models.put("documentPath", documentPath);
sectionModel.setSection(section);
return "org/librecms/ui/contentsection/documents/document-not-found.xhtml"; return "org/librecms/ui/contentsection/documents/document-not-found.xhtml";
} }

2
ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/document-not-found.xhtml
View File

@ -10,7 +10,7 @@
<ui:param name="title" value="#{CmsAdminMessages['contentsection.documents.document.not_found.title']}" /> <ui:param name="title" value="#{CmsAdminMessages['contentsection.documents.document.not_found.title']}" />
<ui:define name="breadcrumb"> <ui:define name="breadcrumb">
<ui:include src="document-breadcrumbs.xhtml" /> <!--<ui:include src="document-breadcrumbs.xhtml" />-->
<li aria-current="page" class="breadcrumb-item"> <li aria-current="page" class="breadcrumb-item">
#{CmsAdminMessages['contentsection.document_not_found.breadcrumb']} #{CmsAdminMessages['contentsection.document_not_found.breadcrumb']}
</li> </li>