Merge branch 'develop' into multiInstanceCompare

xh · Jan 3, 2025 · d52a6fc · d52a6fc
2 parents 8f1fe7d + a41282c
commit d52a6fc
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/grails-app/services/io/xh/hoist/view/ViewService.groovy b/grails-app/services/io/xh/hoist/view/ViewService.groovy
@@ -114,18 +114,23 @@ class ViewService extends BaseService {
     /** Update a view's metadata */
     Map updateInfo(String token, Map data, String username = username) {
         def existing = jsonBlobService.get(token, username),
-            existingMeta = parseObject(existing.meta),
-            isGlobal = !existing.owner,
-            isShared = data.containsKey('isShared') ? data.isShared : existingMeta.isShared;
+            meta = parseObject(existing.meta) ?: [:],
+            core = [:]
+
+        data.each { k, v ->
+            if (['name', 'description'].contains(k)) {
+                core[k] = v
+            } else if (['group', 'isShared', 'isDefaultPinned'].contains(k)) {
+                meta[k] = v
+            }
+        }
 
         def ret = jsonBlobService.update(
             token,
             [
-                *   : data,
-                acl : isGlobal || isShared ? '*' : null,
-                meta: isGlobal ?
-                    [group: data.group, isDefaultPinned: !!data.isDefaultPinned] :
-                    [group: data.group, isShared: !!data.isShared],
+                *: core,
+                meta: meta,
+                acl: !existing.owner || meta.isShared ? '*' : null
             ],
             username
         )