Fixed #18, adapted to newest WebApiClient

XRM-OSS · Jul 5, 2018 · 8304fb6 · 8304fb6
1 parent 31a61f1
commit 8304fb6
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/src/js/PropertyEditor/AttributePropertyHandler.js b/src/js/PropertyEditor/AttributePropertyHandler.js
@@ -140,7 +140,7 @@
         var request = {
             entityName: "EntityDefinition",
             entityId: entityMetadataId,
-            queryParams: "/Attributes?$filter=IsCustomizable/Value eq true and IsLogical eq false"
+            queryParams: "/Attributes?$filter=IsCustomizable/Value eq true"
         };
 
         WebApiClient.Retrieve(request)
@@ -174,7 +174,7 @@
             requests.push(request);
         }
 
-        Promise.resolve(requests)
+        WebApiClient.Promise.resolve(requests)
             .each(function(request) {
                 return WebApiClient.SendRequest(request.method, request.url, request.attribute, request.headers);
             })

diff --git a/src/js/Translator/AttributeHandler.js b/src/js/Translator/AttributeHandler.js
@@ -112,7 +112,7 @@
         var request = {
             entityName: "EntityDefinition",
             entityId: entityMetadataId,
-            queryParams: "/Attributes?$filter=IsCustomizable/Value eq true and IsLogical eq false"
+            queryParams: "/Attributes?$filter=IsCustomizable/Value eq true"
         };
 
         return WebApiClient.Retrieve(request)
@@ -146,7 +146,7 @@
             requests.push(request);
         }
 
-        return Promise.resolve(requests)
+        return WebApiClient.Promise.resolve(requests)
             .each(function(request) {
                 return WebApiClient.SendRequest(request.method, request.url, request.attribute, request.headers);
             })

diff --git a/src/js/Translator/FormHandler.js b/src/js/Translator/FormHandler.js
@@ -396,7 +396,7 @@
             language: initialLanguage
         });
 
-        return Promise.reduce(requests, function(total, request){
+        return WebApiClient.Promise.reduce(requests, function(total, request){
             if (request.action === "Update") {
                 return WebApiClient.Update({
                     overriddenSetName: "usersettingscollection",
@@ -408,7 +408,7 @@
                 });
             }
             else if (request.action === "Retrieve") {
-                return Promise.props({
+                return WebApiClient.Promise.props({
                     forms: WebApiClient.Retrieve(formRequest),
                     languageCode: request.language
                 })

diff --git a/src/js/Translator/FormMetaHandler.js b/src/js/Translator/FormMetaHandler.js
@@ -131,15 +131,15 @@
                             }
                         })
 
-                    var prop = Promise.props({
+                    var prop = WebApiClient.Promise.props({
                         recid: form.formid,
                         labels: WebApiClient.Execute(retrieveLabelsRequest)
                     });
 
                     requests.push(prop);
                 }
 
-                return Promise.all(requests);
+                return WebApiClient.Promise.all(requests);
             })
             .then(function(responses) {
                     var forms = responses;
@@ -174,7 +174,7 @@
             requests.push(request);
         }
 
-        return Promise.resolve(requests)
+        return WebApiClient.Promise.resolve(requests)
             .each(function(request) {
                 return WebApiClient.Execute(request);
             })

diff --git a/src/js/Translator/OptionSetHandler.js b/src/js/Translator/OptionSetHandler.js
@@ -185,7 +185,7 @@
             return OptionSetHandler.Load();
         }
 
-        return Promise.resolve(updates)
+        return WebApiClient.Promise.resolve(updates)
             .each(function(payload) {
                 return WebApiClient.SendRequest("POST", WebApiClient.GetApiUrl() + "UpdateOptionValue", payload);
             })

diff --git a/src/js/Translator/TranslationHandler.js b/src/js/Translator/TranslationHandler.js
@@ -110,7 +110,7 @@
     function GetTranslation(fromLanguage, destLanguage, phrase) {
         $.support.cors = true;
 
-        return Promise.resolve($.ajax({
+        return WebApiClient.Promise.resolve($.ajax({
             url: BuildTranslationUrl(fromLanguage, destLanguage, phrase),
             type: "GET",
             crossDomain: true,
@@ -200,7 +200,7 @@
             translationRequests.push(GetTranslation(fromIso, toIso, record[fromLcid]));
         }
 
-        Promise.all(translationRequests)
+        WebApiClient.Promise.all(translationRequests)
             .then(function (responses) {
                 AddTranslations(fromLcid, destLcid, updateRecords, responses);
                 XrmTranslator.UnlockGrid();

diff --git a/src/js/Translator/ViewHandler.js b/src/js/Translator/ViewHandler.js
@@ -134,15 +134,15 @@
                             }
                         })
 
-                    var prop = Promise.props({
+                    var prop = WebApiClient.Promise.props({
                         recid: view.savedqueryid,
                         labels: WebApiClient.Execute(retrieveLabelsRequest)
                     });
 
                     requests.push(prop);
                 }
 
-                return Promise.all(requests);
+                return WebApiClient.Promise.all(requests);
             })
             .then(function(responses) {
                     var views = responses;
@@ -177,7 +177,7 @@
             requests.push(request);
         }
 
-        Promise.resolve(requests)
+        WebApiClient.Promise.resolve(requests)
             .each(function(request) {
                 return WebApiClient.Execute(request);
             })