Added a 'displayName' optional method in the 'IResource' interface + …

…Use the 'displayName' method when available as text for the 'DAV:displayname' XML element in the PROPFIND response body
OpenMarshal · Jun 15, 2017 · c9812d6 · c9812d6
1 parent c3f8b6a
commit c9812d6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/lib/resource/IResource.d.ts b/lib/resource/IResource.d.ts
@@ -46,5 +46,6 @@ export interface IResource {
     creationDate(callback: ReturnCallback<number>): any;
     lastModifiedDate(callback: ReturnCallback<number>): any;
     webName(callback: ReturnCallback<string>): any;
+    displayName?(callback: ReturnCallback<string>): any;
     type(callback: ReturnCallback<ResourceType>): any;
 }
diff --git a/lib/server/commands/Propfind.js b/lib/server/commands/Propfind.js
@@ -274,7 +274,10 @@ function default_1(arg, callback) {
                         }); });
                     });
                     displayValue('displayname', function () {
-                        resource.webName(function (e, name) { return process.nextTick(function () {
+                        var methodDisplayName = resource.webName;
+                        if (resource.displayName)
+                            methodDisplayName = resource.displayName;
+                        methodDisplayName.bind(resource)(function (e, name) { return process.nextTick(function () {
                             if (!e)
                                 tags.displayname.el.add(name ? name : '');
                             nbOut(e);

diff --git a/src/resource/IResource.ts b/src/resource/IResource.ts
@@ -71,5 +71,6 @@ export interface IResource
     creationDate(callback : ReturnCallback<number>)
     lastModifiedDate(callback : ReturnCallback<number>)
     webName(callback : ReturnCallback<string>)
+    displayName?(callback : ReturnCallback<string>)
     type(callback : ReturnCallback<ResourceType>)
 }
diff --git a/src/server/commands/Propfind.ts b/src/server/commands/Propfind.ts
@@ -365,7 +365,11 @@ export default function(arg : MethodCallArgs, callback)
 
                     displayValue('displayname', () =>
                     {
-                        resource.webName((e, name) => process.nextTick(() => {
+                        let methodDisplayName = resource.webName;
+                        if(resource.displayName)
+                            methodDisplayName = resource.displayName;
+
+                        methodDisplayName.bind(resource)((e, name) => process.nextTick(() => {
                             if(!e)
                                 tags.displayname.el.add(name ? name : '');
                             nbOut(e);