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

Merge branch 'v8-fix-remove-element-type-template-assignment' of https://github.com/kjac/Umbraco-CMS into temp8-pr4117

Browse Source
This commit is contained in:
Stephan
2019-01-22 14:22:36 +01:00
parent e349ead8b5 fa8a754f88
commit c1e81fe40c
7 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web.UI.Client/src/views/documenttypes/views/listview/listview.html
View File

@@ -1,4 +1,4 @@
<umb-box>
<umb-box ng-hide="model.isElement">
<umb-box-content>
<div class="sub-view-columns">
<div class="sub-view-column-left">
@@ -15,4 +15,9 @@
</div>
</div>
</umb-box-content>
</umb-box>
</umb-box>
<umb-empty-state
ng-show="model.isElement"
position="center">
<localize key="contentTypeEditor_elementDoesNotSupport">This is not applicable for an Element type</localize>
</umb-empty-state>

4
src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
View File

@@ -3,7 +3,7 @@
<umb-box>
<umb-box-content>
<div class="sub-view-columns">
<div class="sub-view-columns" ng-hide="model.isElement">
<div class="sub-view-column-left">
<h5><localize key="contentTypeEditor_allowAsRootHeading" /></h5>
@@ -19,7 +19,7 @@
</div>
<div class="sub-view-columns">
<div class="sub-view-columns" ng-hide="model.isElement">
<div class="sub-view-column-left">
<h5><localize key="contentTypeEditor_childNodesHeading" /></h5>

11
src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.controller.js
View File

@@ -19,13 +19,13 @@
vm.canCreateTemplate = false;
vm.updateTemplatePlaceholder = false;
vm.loadingTemplates = false;
vm.isElement = $scope.model.isElement;
vm.createTemplate = createTemplate;
/* ---------- INIT ---------- */
function onInit() {
vm.loadingTemplates = true;
entityResource.getAll("Template").then(function (templates) {
@@ -86,6 +86,15 @@
vm.canCreateTemplate = existingTemplate ? false : true;
}
var unbindWatcher = $scope.$watch("model.isElement",
function(newValue, oldValue) {
vm.isElement = newValue;
}
);
$scope.$on("$destroy", function () {
unbindWatcher();
});
onInit();
}

43
src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html
View File

@@ -1,5 +1,5 @@
<div ng-controller="Umbraco.Editors.DocumentType.TemplatesController as vm">
<umb-box>
<umb-box ng-hide="vm.isElement">
<umb-box-content>
<div class="sub-view-columns">
@@ -9,29 +9,34 @@
</div>
<div class="sub-view-column-right">
<umb-grid-selector
ng-if="vm.availableTemplates"
selected-items="model.allowedTemplates"
available-items="vm.availableTemplates"
default-item="model.defaultTemplate"
item-name="template"
name="model.name"
alias="model.alias"
update-placeholder="vm.updateTemplatePlaceholder">
</umb-grid-selector>
<umb-grid-selector
ng-if="vm.availableTemplates"
selected-items="model.allowedTemplates"
available-items="vm.availableTemplates"
default-item="model.defaultTemplate"
item-name="template"
name="model.name"
alias="model.alias"
update-placeholder="vm.updateTemplatePlaceholder">
</umb-grid-selector>
<umb-button
ng-if="vm.canCreateTemplate"
type="button"
button-style="info"
action="vm.createTemplate()"
state="vm.createTemplateButtonState"
label-key="settings_createMatchingTemplate">
</umb-button>
<umb-button
ng-if="vm.canCreateTemplate"
type="button"
button-style="info"
action="vm.createTemplate()"
state="vm.createTemplateButtonState"
label-key="settings_createMatchingTemplate">
</umb-button>
</div>
</div>
</umb-box-content>
</umb-box>
<umb-empty-state
ng-show="vm.isElement"
position="center">
<localize key="contentTypeEditor_elementDoesNotSupport">This is not applicable for an Element type</localize>
</umb-empty-state>
</div>