server/AyaNova/biz/FormCustomBiz.cs

@@ -86,7 +86,7 @@ namespace AyaNova.Biz
             }
 
             //If it doesn't exist, vet the form key name is ok by checking with this list            
-            if (!AyaFormFieldDefinitions.AyaFormFieldDefinitionKeys.Contains(formKey))
+            if (!FormFieldReference.FormFieldKeys.Contains(formKey))
             {
                 //Nope, whatever it is, it's not valid
                 return null;
@@ -154,7 +154,7 @@ namespace AyaNova.Biz
                 AddError(ApiErrorCode.VALIDATION_REQUIRED, "FormKey");
             else
             {
-                if (!AyaFormFieldDefinitions.IsValidFormFieldDefinitionKey(inObj.FormKey))
+                if (!FormFieldReference.IsValidFormFieldKey(inObj.FormKey))
                 {
                     AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "FormKey");
                 }
@@ -181,7 +181,7 @@ namespace AyaNova.Biz
             if ((!PropertyHasErrors("FormKey") && !string.IsNullOrWhiteSpace(inObj.Template)))
             {
                 var ValidCustomFieldTypes = CustomFieldType.ValidCustomFieldTypes;
-                var ValidFormFields = AyaFormFieldDefinitions.AyaFormFields(inObj.FormKey);
+                var ValidFormFields = FormFieldReference.FormFieldReferenceList(inObj.FormKey);
                 try
                 {
                     //Parse the json, expecting something like this:
@@ -195,7 +195,7 @@ namespace AyaNova.Biz
 
                     for (int i = 0; i < v.Count; i++)
                     {
-                        AyaFormFieldDefinition MasterFormField = null;
+                        FormField MasterFormField = null;
 
                         var formFieldItem = v[i];
                         if (formFieldItem["fld"] == null)