Merge pull request #3420 from dawoe/temp-3419

V8- #3419 - Fix dictionary tree
This commit is contained in:
Shannon Deminick
2018-10-26 13:39:42 +11:00
committed by GitHub
7 changed files with 24 additions and 18 deletions

View File

@@ -19,10 +19,8 @@ function DictionaryEditController($scope, $routeParams, $location, dictionaryRes
vm.page.menu.currentSection = appState.getSectionState("currentSection");
vm.page.menu.currentNode = null;
vm.description = "";
vm.showBackButton = true;
vm.save = saveDictionary;
vm.back = back;
function loadDictionary() {
@@ -102,11 +100,7 @@ function DictionaryEditController($scope, $routeParams, $location, dictionaryRes
});
}
}
function back() {
$location.path("settings/dictionary/list");
}
$scope.$watch("vm.content.name", function (newVal, oldVal) {
//when the value changes, we need to set the name dirty
if (newVal && (newVal !== oldVal) && typeof(oldVal) !== "undefined") {

View File

@@ -12,8 +12,7 @@
hide-icon="true"
hide-description="true"
hide-alias="true"
on-back="vm.back()"
show-back-button="vm.showBackButton">
>
</umb-editor-header>
<umb-editor-container class="form-horizontal">