This depends on a core PR.

This reverts commit f4e449f030.

Conflicts:
	app/Umbraco/Umbraco.Archetype/Models/ArchetypeModel.cs

app/Umbraco/Umbraco.Archetype/Models/ArchetypeModel.cs

@@ -4,7 +4,6 @@ using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Umbraco.Core.Logging;
 
 namespace Archetype.Models
 {
@@ -48,22 +47,6 @@ namespace Archetype.Models
         /// <returns></returns>
         public string SerializeForPersistence()
         {
-            //clean out any properties with a null datatype
-            foreach (var fieldset in Fieldsets)
-            {
-                var properties = fieldset.Properties.ToList();
-
-                foreach (var property in fieldset.Properties)
-                {
-                    if (property.DataTypeGuid == null)
-                    {
-                        properties.Remove(property);
-                    }
-                }
-
-                fieldset.Properties = properties;
-            }
-
             var json = JObject.Parse(JsonConvert.SerializeObject(this, new JsonSerializerSettings() { ReferenceLoopHandling = ReferenceLoopHandling.Ignore }));
 
             var propertiesToRemove = new String[] { "propertyEditorAlias", "dataTypeId", "dataTypeGuid", "hostContentType", "editorState" };

app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.12.0")]
-[assembly: AssemblyFileVersion("1.12.0")]
+[assembly: AssemblyVersion("1.12.1")]
+[assembly: AssemblyFileVersion("1.12.1")]

app/controllers/controller.js

@@ -468,7 +468,7 @@ angular.module("umbraco").controller("Imulus.ArchetypeController", function ($sc
         $scope.activeSubmitWatcher++;
         return $scope.activeSubmitWatcher;
     }
-    $scope.submitWatcherOnSubmit = function () {
-        $scope.$broadcast("archetypeFormSubmitting");
+    $scope.submitWatcherOnSubmit = function (args) {
+        $scope.$broadcast("archetypeFormSubmitting", args);
     }
 });

app/directives/archetypeproperty.js

@@ -115,14 +115,16 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
                     });
 
                     scope.$on('archetypeFormSubmitting', function (ev, args) {
-                        // validate all fieldset properties
-                        _.each(scope.fieldset.properties, function (property) {
-                            archetypeService.validateProperty(scope.fieldset, property, configFieldsetModel);
-                        });
+                        if(args.action !== 'save') {
+                            // validate all fieldset properties
+                            _.each(scope.fieldset.properties, function (property) {
+                                archetypeService.validateProperty(scope.fieldset, property, configFieldsetModel);
+                            });
 
-                        var validationKey = "validation-f" + scope.fieldsetIndex;
+                            var validationKey = "validation-f" + scope.fieldsetIndex;
 
-                        ngModelCtrl.$setValidity(validationKey, scope.fieldset.isValid);
+                            ngModelCtrl.$setValidity(validationKey, scope.fieldset.isValid);
+                        }
 
                         // did the value change (if it did, it most likely did so during the "formSubmitting" event)
                         var property = archetypeService.getFieldsetProperty(scope);

app/directives/archetypesubmitwatcher.js

@@ -3,9 +3,10 @@ angular.module("umbraco.directives").directive('archetypeSubmitWatcher', functio
         // call the load callback on scope to obtain the ID of this submit watcher
         var id = scope.loadCallback();
         scope.$on("formSubmitting", function (ev, args) {
+
             // on the "formSubmitting" event, call the submit callback on scope to notify the Archetype controller to do it's magic
             if (id == scope.activeSubmitWatcher) {
-                scope.submitCallback();
+                scope.submitCallback(args);
             }
         });
     }

config/meta.json

@@ -1,6 +1,6 @@
 {
 	"name": "Archetype",
-	"version": "1.12.0",
+	"version": "1.12.1",
 	"url": "http://github.com/imulus/archetype/",
 	"author": "Imulus - Kevin Giszewski - Tom Fulton - Lee Kelleher - Matt Brailsford - Kenn Jacobsen - Et. Al.",
 	"authorUrl": "http://imulus.com/",