SideNoteEditStep bugfixes

ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/CmsAssetEditSteps.java

@@ -38,4 +38,15 @@ public class CmsAssetEditSteps implements  MvcAssetEditSteps {
         return classes;
     }
 
+    @Override
+    public Set<Class<?>> getResourceClasses() {
+        final Set<Class<?>> classes = new HashSet<>();
+        
+        classes.add(SideNoteEditStepResources.class);
+        
+        return classes;
+    }
+    
+    
+    
 }

ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStep.java

@@ -173,8 +173,7 @@ public class SideNoteEditStep extends AbstractMvcAssetEditStep {
         final String sectionIdentifier,
         @PathParam(MvcAssetEditSteps.ASSET_PATH_PATH_PARAM_NAME)
         final String assetPath,
-        @FormParam("locale") final String localeParam,
+        @FormParam("locale") final String localeParam
-        @FormParam("value") final String value
     ) {
         try {
             init();
@@ -186,7 +185,7 @@ public class SideNoteEditStep extends AbstractMvcAssetEditStep {
 
         if (assetPermissionsChecker.canEditAsset(getAsset())) {
             final Locale locale = new Locale(localeParam);
-            getSideNote().getText().addValue(locale, value);
+            getSideNote().getText().addValue(locale, "");
             assetRepo.save(getSideNote());
 
             return buildRedirectPathForStep();

ccm-cms/src/main/java/org/librecms/ui/contentsections/assets/SideNoteEditStepResources.java

@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2021 LibreCCM Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package org.librecms.ui.contentsections.assets;
+
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.librecms.assets.SideNote;
+import org.librecms.contentsection.Asset;
+import org.librecms.contentsection.AssetRepository;
+import org.librecms.contentsection.ContentSection;
+import org.librecms.ui.contentsections.AssetPermissionsChecker;
+import org.librecms.ui.contentsections.ContentSectionsUi;
+
+import java.util.Locale;
+import java.util.StringTokenizer;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.transaction.Transactional;
+import javax.ws.rs.ForbiddenException;
+import javax.ws.rs.GET;
+import javax.ws.rs.NotFoundException;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+/**
+ *
+ * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
+ */
+@RequestScoped
+@Path(MvcAssetEditSteps.PATH_PREFIX + "sidenote-edit-resources")
+public class SideNoteEditStepResources {
+
+    @Inject
+    private AssetRepository assetRepo;
+
+    @Inject
+    private ContentSectionsUi sectionsUi;
+
+    @Inject
+    private AssetPermissionsChecker assetPermissionsChecker;
+
+    @GET
+    @Path("/variants/wordcount/{locale}")
+    @Produces(MediaType.TEXT_HTML)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String getWordCount(
+        @PathParam(MvcAssetEditSteps.SECTION_IDENTIFIER_PATH_PARAM)
+        final String sectionIdentifier,
+        @PathParam(MvcAssetEditSteps.ASSET_PATH_PATH_PARAM_NAME)
+        final String assetPathParam,
+        @PathParam("locale") final String localeParam
+    ) {
+        final ContentSection contentSection = sectionsUi
+            .findContentSection(sectionIdentifier)
+            .orElseThrow(
+                () -> new NotFoundException()
+            );
+
+        final Asset asset = assetRepo
+            .findByPath(contentSection, assetPathParam)
+            .orElseThrow(() -> new NotFoundException());
+
+        if (!(asset instanceof SideNote)) {
+            throw new NotFoundException();
+        }
+
+        final SideNote sideNote = (SideNote) asset;
+        if (assetPermissionsChecker.canEditAsset(asset)) {
+            final String text = sideNote
+                .getText()
+                .getValue(new Locale(localeParam));
+            final Document jsoupDoc = Jsoup.parseBodyFragment(text);
+            final long result = new StringTokenizer(
+                jsoupDoc.body().text()
+            ).countTokens();
+            return Long.toString(result);
+        } else {
+            throw new ForbiddenException();
+        }
+    }
+
+    @GET
+    @Path("/variants/{locale}")
+    @Produces(MediaType.TEXT_HTML)
+    @Transactional(Transactional.TxType.REQUIRED)
+    public String viewTextValue(
+        @PathParam(MvcAssetEditSteps.SECTION_IDENTIFIER_PATH_PARAM)
+        final String sectionIdentifier,
+        @PathParam(MvcAssetEditSteps.ASSET_PATH_PATH_PARAM_NAME)
+        final String assetPathParam,
+        @PathParam("locale") final String localeParam
+    ) {
+        final ContentSection contentSection = sectionsUi
+            .findContentSection(sectionIdentifier)
+            .orElseThrow(
+                () -> new NotFoundException()
+            );
+
+        final Asset asset = assetRepo
+            .findByPath(contentSection, assetPathParam)
+            .orElseThrow(() -> new NotFoundException());
+
+        if (!(asset instanceof SideNote)) {
+            throw new NotFoundException();
+        }
+
+        final SideNote sideNote = (SideNote) asset;
+        if (assetPermissionsChecker.canEditAsset(asset)) {
+            return sideNote.getText().getValue(new Locale(localeParam));
+        } else {
+            throw new ForbiddenException();
+        }
+    }
+}

ccm-cms/src/main/java/org/librecms/ui/contenttypes/MvcArticleTextBodyStepResources.java

@@ -95,7 +95,9 @@ public class MvcArticleTextBodyStepResources {
                 .getText()
                 .getValue(new Locale(localeParam));
             final Document jsoupDoc = Jsoup.parseBodyFragment(text);
-            long result = new StringTokenizer(jsoupDoc.body().text()).countTokens();
+            final long result = new StringTokenizer(
+                jsoupDoc.body().text()
+            ).countTokens();
             return Long.toString(result);
         } else {
             throw new ForbiddenException();

ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/assets/sidenote/edit-sidenote.xhtml

@@ -11,7 +11,7 @@
         <ui:define name="editStep">
             <div class="container">
                 <h2>#{CmsAssetsStepsDefaultMessagesBundle.getMessage('sidenote.editstep.header', [CmsSideNoteEditStep.name])}</h2>
-            </div>
+
 
                 <h3>#{CmsAssetsStepsDefaultMessagesBundle['editstep.name.header']}</h3>
                 <div class="d-flex">
@@ -111,28 +111,34 @@
                     values="#{CmsSideNoteEditStep.titleValues}"
                     />
 
-             <h3>#{CmsAssetsStepsDefaultMessagesBundle['sidenote.editstep.text.header']}</h3>
+                <c:if test="#{CmsSideNoteEditStep.canEdit}">
-             
+                    <librecms:cmsEditor 
-             <c:if test="#{CmsPostalAddressEditStep.canEdit}">
+                        addButtonLabel="#{CmsAssetsStepsDefaultMessagesBundle['sidenote.sidenote.text.editor.add_variant']}"
-                 <librecms:cmsEditor addButtonLabel="#{CmsAssetsStepsDefaultMessagesBundle['sidenote.sidenote.text.editor.add_variant']}"
+                        addDialogLocaleSelectHelp="#{CmsAssetsStepsDefaultMessagesBundle['sidenote.text.editor.add.locale.help']}"
-                                addDialogLocaleSelectHelp="#{CmsAdminMessages['sidenote.text.editor.add.locale.help']}"
+                        addDialogLocaleSelectLabel="#{CmsAssetsStepsDefaultMessagesBundle['sidenote.text.editor.add.locale.label']}"
-                                addMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/assets/#{CmsSideNoteEditStep.assetPath}/@edit-sidenote/text/add"
+                        addMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/assets/#{CmsSideNoteEditStep.assetPath}/@sidenote-edit/text/add"
-                                editDialogValueHelp="#{CmsAdminMessages['sidenote.text.editor.edit.value.help']}"
+                        editDialogValueHelp="#{CmsAssetsStepsDefaultMessagesBundle['sidenote.text.editor.edit.value.help']}"
-                                editDialogValueLabel="#{CmsAdminMessages['sidenote.text.editor.edit.value.label']}"
+                        editDialogValueLabel="#{CmsAssetsStepsDefaultMessagesBundle['sidenote.text.editor.edit.value.label']}"
-                                editMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/assets/#{CmsSideNoteEditStep.assetPath}/@edit-sidenote/text/edit"
+                        editMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/assets/#{CmsSideNoteEditStep.assetPath}/@sidenote-edit/text/edit"
                         editorId="sidenote-text-editor"
                         hasUnusedLocales="#{!CmsSideNoteEditStep.unusedTextLocales.isEmpty()}"
                         headingLevel="3"
                         objectIdentifier="#{CmsSelectedDocumentModel.itemPath}"
-                                removeMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/assets/#{CmsSideNoteEditStep.assetPath}/@edit-sidenote/text/remove"
+                        removeMethod="#{mvc.basePath}/#{ContentSectionModel.sectionName}/assets/#{CmsSideNoteEditStep.assetPath}/@sidenote-edit/text/remove"
-                                title="#{CmsAssetsStepsDefaultMessagesBundle['sidenote.text.editor.header']}"
+                        title="#{CmsAssetsStepsDefaultMessagesBundle['sidenote.editstep.text.header']}"
-                                unusedLocales="#{CmsArticleTextBodyStep.unusedLocales}"
+                        unusedLocales="#{CmsSideNoteEditStep.unusedTextLocales}"
-                                variantUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/assets/#{CmsSideNoteEditStep.assetPath}/@edit-sidenote/text/variants"
+                        variantUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/assets/#{CmsSideNoteEditStep.assetPath}/@sidenote-edit-resources/text/variants"
                         variants="#{CmsSideNoteEditStep.variants}"
-                                wordCountUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/assets/#{CmsSideNoteEditStep.assetPath}/@edit-sidenote/text/variants/wordcount"
+                        wordCountUrl="#{mvc.basePath}/#{ContentSectionModel.sectionName}/assets/#{CmsSideNoteEditStep.assetPath}/@sidenote-edit-resources/text/variants/wordcount"
                         />
                 </c:if>
+            </div>
 
         </ui:define>
+        
+          <ui:define name="scripts">
+            <script src="#{request.contextPath}/assets/@content-sections/cms-editor.js"></script>
+        </ui:define>
+
     </ui:composition>
 </html>

ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle.properties

@@ -69,3 +69,11 @@ postal_address.description=A postal address.
 side_note.label=Side Note
 side_note.description=A side note.
 sidenote.createform.title=Create a new side note
+sidenote.editstep.header=Edit Side Note {0}
+sidenote.editstep.text.header=Text
+sidenote.sidenote.text.editor.add_variant=Add localized text
+sidenote.text.editor.add.locale.help=The locale of the text variant.
+sidenote.text.editor.add.locale.label=Locale
+sidenote.text.editor.edit.value.help=The localized text.
+sidenote.text.editor.edit.value.label=Text
+sidenote.text.editor.header=Edit Side Note Text

ccm-cms/src/main/resources/org/librecms/ui/MvcAssetStepsBundle_de.properties

@@ -69,3 +69,11 @@ postal_address.description=Eine Postanschrift.
 side_note.label=Randbemerkung
 side_note.description=Eine Randbemerkung.
 sidenote.createform.title=Eine neue Randbemerkungen anlegen
+sidenote.editstep.header=Randbemerkung {0} bearbeiten
+sidenote.editstep.text.header=Text
+sidenote.sidenote.text.editor.add_variant=\u00dcbersetzung hinzuf\u00fcgen
+sidenote.text.editor.add.locale.help=Die Sprache der \u00dcbersetzung.
+sidenote.text.editor.add.locale.label=Sprache
+sidenote.text.editor.edit.value.help=The translated text.
+sidenote.text.editor.edit.value.label=Text
+sidenote.text.editor.header=Text der Randbemerkung bearbeiten

ccm-core/src/main/java/org/libreccm/security/PermissionChecker.java

@@ -132,19 +132,22 @@ public class PermissionChecker {
      * @param object    The object on which the privilege is granted.
      *
      * @return {@code true} if the there is a permission granting the provided
-     * {@code privilege} on the provided {@code object} to the current subject.
+     *         {@code privilege} on the provided {@code object} to the current
+     *         subject.
      */
     public boolean isPermitted(final String privilege, final CcmObject object) {
         if (subject.isAuthenticated()) {
             if (shiro.isSystemUser()) {
                 return true;
             } else {
-                return subject.isPermitted(generatePermissionString(
+                return subject.isPermitted(
-                    privilege, object));
+                    generatePermissionString(privilege, object)
+                );
             }
         } else {
-            return shiro.getPublicUser().isPermitted(generatePermissionString(
+            return shiro.getPublicUser().isPermitted(
-                privilege, object));
+                generatePermissionString(privilege, object)
+            );
         }
     }
 
@@ -219,7 +222,8 @@ public class PermissionChecker {
      * @param object    The object on which the privilege is granted.
      *
      * @throws AuthorizationException If there is no permission granting the
-     * provided privilege to the current subject on the provided object..
+     *                                provided privilege to the current subject
+     *                                on the provided object..
      */
     public void checkPermission(final String privilege,
                                 final CcmObject object)