LibreCCM
/
scientificcms
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some bugfixes

pull/1/head
Jens Pelzetter 2022-07-13 21:15:54 +02:00
parent 10789bc7a5
commit 39e0d4a5be
10 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationAbstractStep.java
View File

@ -12,8 +12,9 @@ import org.librecms.ui.contentsections.documents.MvcAuthoringStepDef;
import org.librecms.ui.contentsections.documents.MvcAuthoringSteps; import org.librecms.ui.contentsections.documents.MvcAuthoringSteps;
import org.scientificcms.publications.Publication; import org.scientificcms.publications.Publication;
import org.scientificcms.publications.PublicationRepository; import org.scientificcms.publications.PublicationRepository;
import org.scientificcms.publications.SciPublicationsConstants; import org.scientificcms.publications.contenttypes.MonographItem;
import org.scientificcms.publications.contenttypes.PublicationItem; import org.scientificcms.publications.contenttypes.PublicationItem;
import org.scientificcms.publications.ui.SciPublicationsUiConstants;
import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle; import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle;
import java.util.Locale; import java.util.Locale;
@ -38,7 +39,7 @@ import javax.ws.rs.PathParam;
@Path(MvcAuthoringSteps.PATH_PREFIX + "publication-abstract") @Path(MvcAuthoringSteps.PATH_PREFIX + "publication-abstract")
@Controller @Controller
@MvcAuthoringStepDef( @MvcAuthoringStepDef(
bundle = SciPublicationsConstants.BUNDLE, bundle = SciPublicationsUiConstants.BUNDLE,
descriptionKey = "authoringsteps.abstract.description", descriptionKey = "authoringsteps.abstract.description",
labelKey = "authoringsteps.abstract.label", labelKey = "authoringsteps.abstract.label",
supportedDocumentType = PublicationItem.class supportedDocumentType = PublicationItem.class
@ -87,7 +88,7 @@ public class PublicationAbstractStep extends AbstractMvcAuthoringStep {
} }
if (itemPermissionChecker.canEditItem(getPublicationItem())) { if (itemPermissionChecker.canEditItem(getPublicationItem())) {
return "/org/scientificcms/contenttypes/publications/ui/publication/abstract.xhtml"; return "org/scientificcms/contenttypes/ui/abstract.xhtml";
} else { } else {
return documentUi.showAccessDenied( return documentUi.showAccessDenied(
getContentSection(), getContentSection(),
@ -129,7 +130,7 @@ public class PublicationAbstractStep extends AbstractMvcAuthoringStep {
new Locale(localeParam).toString() new Locale(localeParam).toString()
); );
return "/org/scientificcms/contenttypes/publications/ui/publication/abstract/view.xhtml"; return "org/scientificcms/contenttypes/ui/abstract/view.xhtml";
} else { } else {
return documentUi.showAccessDenied( return documentUi.showAccessDenied(
getContentSection(), getContentSection(),
@ -207,7 +208,7 @@ public class PublicationAbstractStep extends AbstractMvcAuthoringStep {
new Locale(localeParam).toString() new Locale(localeParam).toString()
); );
return "/org/scientificcms/contenttypes/publications/ui/publication/abstract/edit.xhtml"; return "org/scientificcms/contenttypes/ui/abstract/edit.xhtml";
} else { } else {
return documentUi.showAccessDenied( return documentUi.showAccessDenied(
getContentSection(), getContentSection(),

2
sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationAbstractStepResources.java
View File

@ -87,7 +87,7 @@ public class PublicationAbstractStepResources {
} }
@GET @GET
@Path("/variants/{locale}") @Path("/{locale}")
@Produces(MediaType.TEXT_HTML) @Produces(MediaType.TEXT_HTML)
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public String viewAbstractValue( public String viewAbstractValue(

17
sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationMiscStep.java
View File

@ -12,8 +12,8 @@ import org.librecms.ui.contentsections.documents.MvcAuthoringStepDef;
import org.librecms.ui.contentsections.documents.MvcAuthoringSteps; import org.librecms.ui.contentsections.documents.MvcAuthoringSteps;
import org.scientificcms.publications.Publication; import org.scientificcms.publications.Publication;
import org.scientificcms.publications.PublicationRepository; import org.scientificcms.publications.PublicationRepository;
import org.scientificcms.publications.SciPublicationsConstants;
import org.scientificcms.publications.contenttypes.PublicationItem; import org.scientificcms.publications.contenttypes.PublicationItem;
import org.scientificcms.publications.ui.SciPublicationsUiConstants;
import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle; import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle;
import java.util.Locale; import java.util.Locale;
@ -38,7 +38,7 @@ import javax.ws.rs.PathParam;
@Path(MvcAuthoringSteps.PATH_PREFIX + "publication-misc") @Path(MvcAuthoringSteps.PATH_PREFIX + "publication-misc")
@Controller @Controller
@MvcAuthoringStepDef( @MvcAuthoringStepDef(
bundle = SciPublicationsConstants.BUNDLE, bundle = SciPublicationsUiConstants.BUNDLE,
descriptionKey = "authoringsteps.misc.description", descriptionKey = "authoringsteps.misc.description",
labelKey = "authoringsteps.misc.label", labelKey = "authoringsteps.misc.label",
supportedDocumentType = PublicationItem.class supportedDocumentType = PublicationItem.class
@ -87,7 +87,7 @@ public class PublicationMiscStep extends AbstractMvcAuthoringStep {
} }
if (itemPermissionChecker.canEditItem(getPublicationItem())) { if (itemPermissionChecker.canEditItem(getPublicationItem())) {
return "/org/scientificcms/contenttypes/publications/ui/publication/misc.xhtml"; return "org/scientificcms/contenttypes/ui/misc.xhtml";
} else { } else {
return documentUi.showAccessDenied( return documentUi.showAccessDenied(
getContentSection(), getContentSection(),
@ -129,7 +129,7 @@ public class PublicationMiscStep extends AbstractMvcAuthoringStep {
new Locale(localeParam).toString() new Locale(localeParam).toString()
); );
return "/org/scientificcms/contenttypes/publications/ui/publication/misc/view.xhtml"; return "org/scientificcms/contenttypes/ui/misc/view.xhtml";
} else { } else {
return documentUi.showAccessDenied( return documentUi.showAccessDenied(
getContentSection(), getContentSection(),
@ -204,7 +204,7 @@ public class PublicationMiscStep extends AbstractMvcAuthoringStep {
if (itemPermissionChecker.canEditItem(getPublicationItem())) { if (itemPermissionChecker.canEditItem(getPublicationItem())) {
miscStepModel.setSelectedLocale(new Locale(localeParam).toString()); miscStepModel.setSelectedLocale(new Locale(localeParam).toString());
return "/org/scientificcms/contenttypes/publications/ui/publication/misc/edit.xhtml"; return "org/scientificcms/contenttypes/ui/misc/edit.xhtml";
} else { } else {
return documentUi.showAccessDenied( return documentUi.showAccessDenied(
getContentSection(), getContentSection(),
@ -294,6 +294,13 @@ public class PublicationMiscStep extends AbstractMvcAuthoringStep {
); );
if (canEdit) { if (canEdit) {
miscStepModel.setCanEdit(canEdit); miscStepModel.setCanEdit(canEdit);
miscStepModel.setPublicationTitle(
globalizationHelper
.getValueFromLocalizedString(
getPublication().getTitle()
)
);
miscStepModel.setMiscValues( miscStepModel.setMiscValues(
getPublication() getPublication()
.getMisc() .getMisc()

2
sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/PublicationMiscStepResources.java
View File

@ -86,7 +86,7 @@ public class PublicationMiscStepResources {
} }
@GET @GET
@Path("/variants/{locale}") @Path("/{locale}")
@Produces(MediaType.TEXT_HTML) @Produces(MediaType.TEXT_HTML)
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public String viewTextValue( public String viewTextValue(

2
sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/abstract.xhtml
View File

@ -9,7 +9,7 @@
<ui:define name="authoringStep"> <ui:define name="authoringStep">
<h2>#{SciPublicationsUiMessageBundle.getMessage('editsteps.abstract.header', SciCmsPublicationAbstractStepModel.publicationTitle)}</h2> <h2>#{SciPublicationsUiMessageBundle.getMessage('editsteps.abstract.header', [SciCmsPublicationAbstractStepModel.publicationTitle])}</h2>
<librecms:cmsEditorVariants <librecms:cmsEditorVariants
addButtonLabel="#{SciPublicationsUiMessageBundle['editsteps.abstract.editor.add_variant']}" addButtonLabel="#{SciPublicationsUiMessageBundle['editsteps.abstract.editor.add_variant']}"

4
sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/abstract/edit.xhtml
View File

@ -10,7 +10,7 @@
<ui:define name="authoringStep"> <ui:define name="authoringStep">
<div class="d-flex"> <div class="d-flex">
<a class="btn btn-secondary btn-sm align-self-center mr-2" <a class="btn btn-secondary btn-sm align-self-center mr-2"
href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/docuemnts/#{CmsSelectedDocumentModel.itemPath}/@publication-abstract"> href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-abstract">
<bootstrap:svgIcon icon="caret-left-fill" /> <bootstrap:svgIcon icon="caret-left-fill" />
<span class="sr-only">#{SciPublicationsUiMessageBundle['editsteps.abstract.step_back']}</span> <span class="sr-only">#{SciPublicationsUiMessageBundle['editsteps.abstract.step_back']}</span>
</a> </a>
@ -20,7 +20,7 @@
<c:if test="#{SciCmsPublicationAbstractStepModel.canEdit}"> <c:if test="#{SciCmsPublicationAbstractStepModel.canEdit}">
<librecms:cmsEditor <librecms:cmsEditor
backUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/docuemnts/#{CmsSelectedDocumentModel.itemPath}/@publication-abstract" backUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-abstract"
baseUrl="#{mvc.basePath}" baseUrl="#{mvc.basePath}"
canEdit="#{SciCmsPublicationAbstractStepModel.canEdit}" canEdit="#{SciCmsPublicationAbstractStepModel.canEdit}"
contentSection="#{ContentSectionModel.sectionName}" contentSection="#{ContentSectionModel.sectionName}"

3
sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/abstract/view.xhtml
View File

@ -23,7 +23,7 @@
<c:if test="#{SciCmsPublicationAbstractStepModel.canEdit}"> <c:if test="#{SciCmsPublicationAbstractStepModel.canEdit}">
<div class="text-right"> <div class="text-right">
<a class="btn btn-secondary" <a class="btn btn-secondary"
href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-abstract/abstract/edit"> href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-abstract/abstract/edit/#{SciCmsPublicationAbstractStepModel.selectedLocale}">
<bootstrap:svgIcon icon="pen" /> <bootstrap:svgIcon icon="pen" />
<span class="sr-only">#{SciPublicationsUiMessageBundle['editsteps.abstract.edit']}</span> <span class="sr-only">#{SciPublicationsUiMessageBundle['editsteps.abstract.edit']}</span>
</a> </a>
@ -33,6 +33,7 @@
<div class="cms-text-preview article-text border p-2"> <div class="cms-text-preview article-text border p-2">
<h:outputText escape="false" <h:outputText escape="false"
value="#{SciCmsPublicationAbstractStepModel.abstractValues.get(SciCmsPublicationAbstractStepModel.selectedLocale)}" value="#{SciCmsPublicationAbstractStepModel.abstractValues.get(SciCmsPublicationAbstractStepModel.selectedLocale)}"
/>
</div> </div>
</ui:define> </ui:define>

10
sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/misc.xhtml
View File

@ -9,21 +9,21 @@
<ui:define name="authoringStep"> <ui:define name="authoringStep">
<h2>#{SciPublicationsUiMessageBundle.getMessage('editsteps.misc.header', SciCmsPublicationAbstractStepModel.publicationTitle)}</h2> <h2>#{SciPublicationsUiMessageBundle.getMessage('editsteps.misc.header', [SciCmsPublicationMiscStepModel.publicationTitle])}</h2>
<librecms:cmsEditorVariants <librecms:cmsEditorVariants
addButtonLabel="#{SciPublicationsUiMessageBundle['editsteps.misc.editor.add_variant']}" addButtonLabel="#{SciPublicationsUiMessageBundle['editsteps.misc.editor.add_variant']}"
addDialogLocaleSelectHelp="#{SciPublicationsUiMessageBundle['editsteps.misc.editor.add.locale_help']}" addDialogLocaleSelectHelp="#{SciPublicationsUiMessageBundle['editsteps.misc.editor.add.locale_help']}"
addMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/add" addMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/add"
canEdit="#{SciCmsPublicationAbstractStepModel.canEdit}" canEdit="#{SciCmsPublicationMiscStepModel.canEdit}"
editorPageUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/edit" editorPageUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/edit"
hasUnusedLocales="#{!SciCmsPublicationAbstractStepModel.unusedLocales.isEmpty()}" hasUnusedLocales="#{!SciCmsPublicationMiscStepModel.unusedLocales.isEmpty()}"
headingLevel="3" headingLevel="3"
removeMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/remove" removeMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/remove"
sourceEditorPageUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/edit-source" sourceEditorPageUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/edit-source"
title="#{SciPublicationsUiMessageBundle['editsteps.misc.editor.header']}" title="#{SciPublicationsUiMessageBundle['editsteps.misc.editor.header']}"
unusedLocales="#{SciCmsPublicationAbstractStepModel.unusedLocales}" unusedLocales="#{SciCmsPublicationMiscStepModel.unusedLocales}"
variants="#{SciCmsPublicationAbstractStepModel.variants}" variants="#{SciCmsPublicationMiscStepModel.variants}"
variantsId="publication-misc" variantsId="publication-misc"
viewPageUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/view" viewPageUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/view"
/> />

10
sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/misc/edit.xhtml
View File

@ -10,7 +10,7 @@
<ui:define name="authoringStep"> <ui:define name="authoringStep">
<div class="d-flex"> <div class="d-flex">
<a class="btn btn-secondary btn-sm align-self-center mr-2" <a class="btn btn-secondary btn-sm align-self-center mr-2"
href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/docuemnts/#{CmsSelectedDocumentModel.itemPath}/@publication-misc"> href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc">
<bootstrap:svgIcon icon="caret-left-fill" /> <bootstrap:svgIcon icon="caret-left-fill" />
<span class="sr-only">#{SciPublicationsUiMessageBundle['editsteps.misc.step_back']}</span> <span class="sr-only">#{SciPublicationsUiMessageBundle['editsteps.misc.step_back']}</span>
</a> </a>
@ -18,16 +18,16 @@
<h2>#{SciPublicationsUiMessageBundle['editsteps.misc.header_edit']}</h2> <h2>#{SciPublicationsUiMessageBundle['editsteps.misc.header_edit']}</h2>
</div> </div>
<c:if test="#{SciCmsPublicationAbstractStepModel.canEdit}"> <c:if test="#{SciCmsPublicationMiscStepModel.canEdit}">
<librecms:cmsEditor <librecms:cmsEditor
backUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/docuemnts/#{CmsSelectedDocumentModel.itemPath}/@publication-misc" backUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc"
baseUrl="#{mvc.basePath}" baseUrl="#{mvc.basePath}"
canEdit="#{SciCmsPublicationAbstractStepModel.canEdit}" canEdit="#{SciCmsPublicationMiscStepModel.canEdit}"
contentSection="#{ContentSectionModel.sectionName}" contentSection="#{ContentSectionModel.sectionName}"
editMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/edit" editMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/edit"
editorId="scipublication-misc-editor" editorId="scipublication-misc-editor"
objectIdentifier="#{CmsSelectedDocumentModel.itemPath}" objectIdentifier="#{CmsSelectedDocumentModel.itemPath}"
selectedLocale="#{SciCmsPublicationAbstractStepModel.selectedLocale}" selectedLocale="#{SciCmsPublicationMiscStepModel.selectedLocale}"
title="#{SciPublicationsUiMessageBundle['editsteps.misc.editor.header']}" title="#{SciPublicationsUiMessageBundle['editsteps.misc.editor.header']}"
variantUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc-resources" variantUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc-resources"
/> />

7
sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/misc/view.xhtml
View File

@ -20,10 +20,10 @@
</div> </div>
<c:if test="#{SciCmsPublicationAbstractStepModel.canEdit}"> <c:if test="#{SciCmsPublicationMiscStepModel.canEdit}">
<div class="text-right"> <div class="text-right">
<a class="btn btn-secondary" <a class="btn btn-secondary"
href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/edit"> href="#{mvc.basePath}/#{ContentSectionModel.sectionName}/documents/#{CmsSelectedDocumentModel.itemPath}/@publication-misc/misc/edit/#{SciCmsPublicationMiscStepModel.selectedLocale}">
<bootstrap:svgIcon icon="pen" /> <bootstrap:svgIcon icon="pen" />
<span class="sr-only">#{SciPublicationsUiMessageBundle['editsteps.misc.edit']}</span> <span class="sr-only">#{SciPublicationsUiMessageBundle['editsteps.misc.edit']}</span>
</a> </a>
@ -32,7 +32,8 @@
<div class="cms-text-preview article-text border p-2"> <div class="cms-text-preview article-text border p-2">
<h:outputText escape="false" <h:outputText escape="false"
value="#{SciCmsPublicationAbstractStepModel.miscValues.get(SciCmsPublicationAbstractStepModel.selectedLocale)}" value="#{SciCmsPublicationMiscStepModel.miscValues.get(SciCmsPublicationMiscStepModel.selectedLocale)}"
/>
</div> </div>
</ui:define> </ui:define>