MCR-3264 fix small issues

MyCoRe-Org · Feb 17, 2025 · 7744dfd · 7744dfd
1 parent 6bacdc2
commit 7744dfd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/mycore-base/src/main/java/org/mycore/frontend/cli/MCRAccessCommands.java b/mycore-base/src/main/java/org/mycore/frontend/cli/MCRAccessCommands.java
@@ -329,7 +329,7 @@ public static void permissionUpdateForID(String permission, String id, String ru
      *            rule is multiple used
      */
     @MCRCommand(syntax = "update permission {0} for id {1} with rulefile {2} described by {3}",
-        help = "The command updates access rule for a given id of a given permission with a given rule file and"
+        help = "The command updates access rule for a given id of a given permission with a given rule file and "
             + "description",
         order = 61)
     public static void permissionFileUpdateForID(String permission, String id, String strFileRule, String description) {

diff --git a/mycore-user2/src/main/java/org/mycore/user2/MCRUserServlet.java b/mycore-user2/src/main/java/org/mycore/user2/MCRUserServlet.java
@@ -83,6 +83,8 @@ public class MCRUserServlet extends MCRServlet {
 
     private static final String ATTRIBUTE_REALM = "realm";
 
+    private static final String ATTRIBUTE_VALUE = "value";
+
     /**
      * Handles requests. The parameter 'action' selects what to do, possible
      * values are show, save, delete, password (with id as second parameter).
@@ -427,7 +429,9 @@ private void updateBasicUserInfo(Element u, MCRUser user) {
             .map(attributes -> attributes.getChildren("attribute"))
             .orElse(Collections.emptyList());
         Set<MCRUserAttribute> newAttrs = attributeList.stream()
-            .map(a -> new MCRUserAttribute(a.getAttributeValue(ATTRIBUTE_NAME), a.getAttributeValue("value")))
+            .map(a -> new MCRUserAttribute(
+                a.getAttributeValue(ATTRIBUTE_NAME),
+                a.getAttributeValue(ATTRIBUTE_VALUE)))
             .collect(Collectors.toSet());
         user.getAttributes().retainAll(newAttrs);
         newAttrs.removeAll(user.getAttributes());

diff --git a/mycore-wcms2/src/main/java/org/mycore/wcms2/navigation/MCRWCMSContentManager.java b/mycore-wcms2/src/main/java/org/mycore/wcms2/navigation/MCRWCMSContentManager.java
@@ -124,7 +124,7 @@ public JsonObject getContent(String webpageId) throws IOException, JDOMException
     public JsonObject getContent(Element e) {
         JsonArray sectionArray = this.sectionProvider.toJSON(e);
         JsonObject content = new JsonObject();
-        content.addProperty(JSON_PROPERTY_TYPE, JSON_PROPERTY_CONTENT);
+        content.addProperty(JSON_PROPERTY_TYPE, "content");
         content.add(JSON_PROPERTY_CONTENT, sectionArray);
         return content;
     }