swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7325 from kjac/v8/fix/treepicker-conditionally-load-languages

Browse Source 
V8: Don't load languages in treepicker unless they're needed
This commit is contained in:
Poornima Nayar
2020-02-26 16:08:31 +00:00
committed by GitHub
parent 384746cd26 492fb01ad9
commit a43fbaee82
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js
+13 -11
View File
@@ -78,18 +78,20 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
*/
function onInit () {
// load languages
languageResource.getAll().then(function (languages) {
vm.languages = languages;
if (vm.showLanguageSelector) {
// load languages
languageResource.getAll().then(function (languages) {
vm.languages = languages;
// set the default language
vm.languages.forEach(function (language) {
if (language.isDefault) {
vm.selectedLanguage = language;
vm.languageSelectorIsOpen = false;
}
// set the default language
vm.languages.forEach(function (language) {
if (language.isDefault) {
vm.selectedLanguage = language;
vm.languageSelectorIsOpen = false;
}
});
});
});
}
if (vm.treeAlias === "content") {
vm.entityType = "Document";
@@ -214,7 +216,7 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController",
if (vm.dataTypeKey) {
queryParams["dataTypeKey"] = vm.dataTypeKey;
}
var queryString = $.param(queryParams); //create the query string from the params object
if (!queryString) {