server/AyaNova/DataList/DataListFetcher.cs

@@ -32,19 +32,19 @@ namespace AyaNova.DataList
             }
 
             //FETCH DATALISTTEMPLATE HERE OR USE DEFAULT IF FAULTY OR NOT FOUND
-
             //start with default
-            string JSONDataListTemplate=DataList.DefaultDataListDisplayTemplate;
+            string JSONDataListTemplate = DataList.DefaultDataListDisplayTemplate;
 
             var CustomDataListTemplate = await ct.DataListTemplate.FirstOrDefaultAsync(x => x.DataListKey == listOptions.DataListKey);
-            //Null is expected unless user has created a new one
-            if(CustomDataListTemplate!=null){
-                //todo: validate the template first here need a new method to do that
-                //Assuming it's valid then use it
-                JSONDataListTemplate = CustomDataListTemplate.Template;
+            //Null is expected unless user has created a custom one
+            if (CustomDataListTemplate != null)
+            {
+                //Make sure it's valid, if not then don't use it
+                if (DataList.ValidateTemplate(CustomDataListTemplate.Template))
+                    JSONDataListTemplate = CustomDataListTemplate.Template;
             }
-           
-            
+
+
 
             //PARSE THE TEMPLATE INTO A STRING ARRAY
             //SO WE KNOW WHICH FIELDS TO RETURN FROM QUERY