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

Ensuring you can create new document types in root.

Browse Source 
Parsing result of webservice call as integer.
Ensuring the correct error messages are shown.
This commit is contained in:
Claus
2016-01-12 13:06:33 +01:00
parent e17c900beb
commit bbd6908af3
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
View File

@@ -251,7 +251,7 @@
}),
//get content type count
countContentTypeResource().then(function (result) {
scope.compositionsDialogModel.totalContentTypes = result;
scope.compositionsDialogModel.totalContentTypes = parseInt(result, 10);
})
]).then(function () {
//resolves when both other promises are done, now show it

7
src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html
View File

@@ -15,13 +15,12 @@
</div>
<umb-empty-state
ng-if="model.totalContentTypes === 0"
ng-if="model.availableCompositeContentTypes.length === 0 && model.totalContentTypes <= 1"
position="center">
There are no content types available to use as a composition.
</umb-empty-state>
<umb-empty-state
ng-if="model.availableCompositeContentTypes.length === 0 && model.totalContentTypes !== 0"
ng-if="model.availableCompositeContentTypes.length === 0 && model.totalContentTypes > 1"
position="center">
This content type is used in a composition, and therefore cannot be composed itself.
</umb-empty-state>
@@ -42,4 +41,4 @@
</div>
</li>
</ul>
</ul>