From eef42107855464b635b3f83502f18efef21975d3 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Thu, 9 Dec 2021 21:02:57 +0100 Subject: [PATCH] Fixed inconsistiency of canEdit usage in authoring steps --- .../documents/AbstractMvcAuthoringStep.java | 1 + .../documents/SelectedDocumentModel.java | 16 +- .../MvcArticlePropertiesStep.java | 2 - .../MvcArticlePropertiesStepModel.java | 10 - .../librecms/cmsEditorVariants.xhtml | 2 +- .../documents/categorization.xhtml | 125 +++---- .../ui/contentsection/documents/media.xhtml | 318 ++++++++-------- .../documents/relatedinfo.xhtml | 344 +++++++++--------- .../article/article-basic-properties.xhtml | 8 +- .../contenttypes/article/article-text.xhtml | 42 --- .../article-text/available-languages.xhtml | 1 + 11 files changed, 430 insertions(+), 439 deletions(-) delete mode 100644 ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-text.xhtml diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/AbstractMvcAuthoringStep.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/AbstractMvcAuthoringStep.java index fba6cf546..ae969a895 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/AbstractMvcAuthoringStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/AbstractMvcAuthoringStep.java @@ -133,6 +133,7 @@ public abstract class AbstractMvcAuthoringStep implements MvcAuthoringStep { ) ); documentModel.setContentItem(document); + documentModel.setCanEdit(getCanEdit()); documentPath = itemManager.getItemPath(document); final Map values = new HashMap<>(); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/SelectedDocumentModel.java b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/SelectedDocumentModel.java index a318e9996..1989b21e7 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/SelectedDocumentModel.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contentsections/documents/SelectedDocumentModel.java @@ -45,7 +45,6 @@ import javax.enterprise.context.RequestScoped; import javax.inject.Inject; import javax.inject.Named; import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Path; import javax.ws.rs.core.UriBuilder; /** @@ -140,6 +139,11 @@ public class SelectedDocumentModel { */ private boolean excludeDefaultAuthoringSteps; + /** + * Can the current user edit the document. + */ + private boolean canEdit; + /** * The workflow assigned to the current content item. */ @@ -186,6 +190,14 @@ public class SelectedDocumentModel { return excludeDefaultAuthoringSteps; } + public boolean getCanEdit() { + return canEdit; + } + + public void setCanEdit(final boolean canEdit) { + this.canEdit = canEdit; + } + public String getWorkflowName() { return workflowName; } @@ -348,7 +360,7 @@ public class SelectedDocumentModel { ) { final MvcAuthoringStepDef stepAnnotation = authoringStepClass .getAnnotation(MvcAuthoringStepDef.class); - final LocalizedTextsUtil textsUtil = globalizationHelper + final LocalizedTextsUtil textsUtil = globalizationHelper .getLocalizedTextsUtil(stepAnnotation.bundle()); final AuthoringStepListEntry entry = new AuthoringStepListEntry(); entry.setDescription(textsUtil.getText(stepAnnotation.descriptionKey())); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStep.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStep.java index ee3e10c79..cd669cdca 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStep.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStep.java @@ -127,8 +127,6 @@ public class MvcArticlePropertiesStep extends AbstractMvcAuthoringStep { articlePropertiesStepModel.setName(getDocument().getDisplayName()); - articlePropertiesStepModel.setCanEdit(getCanEdit()); - final Set titleLocales = getDocument() .getTitle() .getAvailableLocales(); diff --git a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStepModel.java b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStepModel.java index 6d5b7e1c0..392a82ecb 100644 --- a/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStepModel.java +++ b/ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticlePropertiesStepModel.java @@ -37,8 +37,6 @@ public class MvcArticlePropertiesStepModel { private String name; - private boolean canEdit; - private Map titleValues; private List unusedTitleLocales; @@ -55,14 +53,6 @@ public class MvcArticlePropertiesStepModel { this.name = name; } - public boolean getCanEdit() { - return canEdit; - } - - public void setCanEdit(final boolean canEdit) { - this.canEdit = canEdit; - } - public Map getTitleValues() { return Collections.unmodifiableMap(titleValues); } diff --git a/ccm-cms/src/main/resources/META-INF/resources/components/librecms/cmsEditorVariants.xhtml b/ccm-cms/src/main/resources/META-INF/resources/components/librecms/cmsEditorVariants.xhtml index 8d1d9c8fc..6318a72a7 100644 --- a/ccm-cms/src/main/resources/META-INF/resources/components/librecms/cmsEditorVariants.xhtml +++ b/ccm-cms/src/main/resources/META-INF/resources/components/librecms/cmsEditorVariants.xhtml @@ -222,7 +222,7 @@
- +
+ + +
- -
+
    - -
  • #{assigned}
    • -     + +
  • #{assigned}
    • +
@@ -91,7 +95,6 @@ - diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/media.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/media.xhtml index 31730f540..eec6c2d8d 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/media.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/media.xhtml @@ -8,10 +8,10 @@ - +

#{CmsDefaultStepsMessageBundle.getMessage("media.title", [CmsSelectedDocumentModel.itemTitle])}

- + -
- -
- @@ -305,22 +317,24 @@ -
- -
+ +
+ +
+ diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/relatedinfo.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/relatedinfo.xhtml index 99e9d3d3b..c2e706255 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/relatedinfo.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/relatedinfo.xhtml @@ -8,10 +8,10 @@ - +

#{CmsDefaultStepsMessageBundle.getMessage("relatedinfo.title", [CmsSelectedDocumentModel.itemTitle])}

- + -
- -
- @@ -301,22 +313,24 @@ -
- -
+ +
+ +
+ diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-basic-properties.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-basic-properties.xhtml index fd9672d8c..f01444731 100644 --- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-basic-properties.xhtml +++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contenttypes/article/article-basic-properties.xhtml @@ -15,7 +15,7 @@

#{CmsArticleMessageBundle.getMessage('basicproperties.name.header')}

#{CmsArticlePropertiesStep.name}
- +
- +