From 234827d5fd311f8ed266c7ffffb6b6e69d1daca5 Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Fri, 26 May 2017 18:31:11 +0200 Subject: [PATCH] Mostly fixes UI glitches for list settings. Fixes #679 --- src/UI/Settings/NetImport/Edit/NetImportEditView.js | 11 ++++++++--- .../NetImport/Edit/NetImportEditViewTemplate.hbs | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/UI/Settings/NetImport/Edit/NetImportEditView.js b/src/UI/Settings/NetImport/Edit/NetImportEditView.js index 6e010a88e..ddf83530b 100644 --- a/src/UI/Settings/NetImport/Edit/NetImportEditView.js +++ b/src/UI/Settings/NetImport/Edit/NetImportEditView.js @@ -42,9 +42,14 @@ var view = Marionette.ItemView.extend({ }, onRender : function() { - var defaultRoot = Config.getValue(Config.Keys.DefaultRootFolderId); - if (RootFolders.get(defaultRoot)) { - this.ui.rootFolder.val(defaultRoot); + var rootFolder = this.model.get("rootFolderPath") + if (rootFolder != "") { + this.ui.rootFolder.val(rootFolder) + } else { + var defaultRoot = Config.getValue(Config.Keys.DefaultRootFolderId); + if (RootFolders.get(defaultRoot)) { + this.ui.rootFolder.val(defaultRoot); + } } }, diff --git a/src/UI/Settings/NetImport/Edit/NetImportEditViewTemplate.hbs b/src/UI/Settings/NetImport/Edit/NetImportEditViewTemplate.hbs index e28717312..6bb241873 100644 --- a/src/UI/Settings/NetImport/Edit/NetImportEditViewTemplate.hbs +++ b/src/UI/Settings/NetImport/Edit/NetImportEditViewTemplate.hbs @@ -89,7 +89,7 @@
- {{#if rootFolders}} {{#each rootFolders}}