Fixed custom properties' attributes removing the property namespace (…

…xmlns)
OpenMarshal · Aug 20, 2017 · 70c5341 · 70c5341
1 parent 0caed21
commit 70c5341
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/lib/server/v2/commands/Propfind.js b/lib/server/v2/commands/Propfind.js
@@ -313,9 +313,14 @@ var default_1 = (function () {
                                 for (var name_1 in properties) {
                                     if (reqBody.mustDisplay(name_1)) {
                                         var tag = prop.ele(name_1);
+                                        console.log(name_1, tag);
                                         if (reqBody.mustDisplayValue(name_1)) {
                                             var property = properties[name_1];
-                                            tag.attributes = property.attributes;
+                                            if (tag.attributes)
+                                                for (var attName in property.attributes)
+                                                    tag.attributes[attName] = property.attributes[attName];
+                                            else
+                                                tag.attributes = property.attributes;
                                             tag.add(property.value);
                                         }
                                     }

diff --git a/src/server/v2/commands/Propfind.ts b/src/server/v2/commands/Propfind.ts
@@ -472,10 +472,16 @@ export default class implements HTTPMethod
                                         if(reqBody.mustDisplay(name))
                                         {
                                             const tag = prop.ele(name);
+                                            console.log(name, tag);
                                             if(reqBody.mustDisplayValue(name))
                                             {
                                                 const property = properties[name];
-                                                tag.attributes = property.attributes;
+                                                if(tag.attributes)
+                                                    for(const attName in property.attributes)
+                                                        tag.attributes[attName] = property.attributes[attName];
+                                                else
+                                                    tag.attributes = property.attributes;
+
                                                 tag.add(property.value);
                                             }
                                         }