Merge remote-tracking branch 'origin/dev-v7' into dev-v8

2016-04-13 16:09:14 +02:00
parent a3158b48ac 7886b7814d
commit 43f0d77c10
1 changed files with 2 additions and 1 deletions
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
@@ -145,7 +145,8 @@

                            contentTypeHelper.generateModels().then(function (result) {

-                                if (result.success) {
+                                // generateModels() returns the dashboard content
+                                if (!result.lastError) {

                                    //re-check model status
                                    contentTypeHelper.checkModelsBuilderStatus().then(function(statusResult) {