From 2ade58ce633eb3bb606dae29e7989b39228be067 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Sat, 28 Jan 2017 23:28:13 +0100
Subject: [PATCH] fix: Fixed a bug that didn't correctly handle validation
 errors on the attribute add popup, fixes #1875

---
 app/View/Attributes/add.ctp  | 6 +++---
 app/View/Attributes/edit.ctp | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/View/Attributes/add.ctp b/app/View/Attributes/add.ctp
index 59c21d869..36e4e6c86 100644
--- a/app/View/Attributes/add.ctp
+++ b/app/View/Attributes/add.ctp
@@ -109,13 +109,14 @@
 	}
 ?>
 <script type="text/javascript">
+var fieldsArray = new Array('AttributeCategory', 'AttributeType', 'AttributeValue', 'AttributeDistribution', 'AttributeComment', 'AttributeToIds', 'AttributeBatchImport', 'AttributeSharingGroupId');
 <?php
 	$formInfoTypes = array('distribution' => 'Distribution', 'category' => 'Category', 'type' => 'Type');
 	echo 'var formInfoFields = ' . json_encode($formInfoTypes) . PHP_EOL;
 	foreach ($formInfoTypes as $formInfoType => $humanisedName) {
 		echo 'var ' . $formInfoType . 'FormInfoValues = {' . PHP_EOL;
 		foreach ($info[$formInfoType] as $key => $formInfoData) {
-			echo '"' . $key . '": "<span class=\"blue bold\">' . h($formInfoData['key']) . '</span>: ' . h($formInfoData['desc']) . '<br />",' . PHP_EOL; 
+			echo '"' . $key . '": "<span class=\"blue bold\">' . h($formInfoData['key']) . '</span>: ' . h($formInfoData['desc']) . '<br />",' . PHP_EOL;
 		}
 		echo '}' . PHP_EOL;
 	}
@@ -157,11 +158,10 @@ $(document).ready(function() {
 			$('#SGContainer').hide();
 		}
 	});
-	
+
 	$("#AttributeCategory, #AttributeType, #AttributeDistribution").change(function() {
 		initPopoverContent('Attribute');
 	});
-
 	<?php if ($ajax): ?>
 		$('#cancel_attribute_add').click(function() {
 			cancelPopoverForm();
diff --git a/app/View/Attributes/edit.ctp b/app/View/Attributes/edit.ctp
index d1061a90e..2b8bfc414 100644
--- a/app/View/Attributes/edit.ctp
+++ b/app/View/Attributes/edit.ctp
@@ -67,13 +67,14 @@
 	echo $this->element('side_menu', array('menuList' => 'event', 'menuItem' => 'addAttribute', 'event' => $event));
 ?>
 <script type="text/javascript">
+var fieldsArray = new Array('AttributeCategory', 'AttributeType', 'AttributeValue', 'AttributeDistribution', 'AttributeComment', 'AttributeToIds', 'AttributeBatchImport', 'AttributeSharingGroupId');
 <?php
 	$formInfoTypes = array('distribution' => 'Distribution', 'category' => 'Category', 'type' => 'Type');
 	echo 'var formInfoFields = ' . json_encode($formInfoTypes) . PHP_EOL;
 	foreach ($formInfoTypes as $formInfoType => $humanisedName) {
 		echo 'var ' . $formInfoType . 'FormInfoValues = {' . PHP_EOL;
 		foreach ($info[$formInfoType] as $key => $formInfoData) {
-			echo '"' . $key . '": "<span class=\"blue bold\">' . h($formInfoData['key']) . '</span>: ' . h($formInfoData['desc']) . '<br />",' . PHP_EOL; 
+			echo '"' . $key . '": "<span class=\"blue bold\">' . h($formInfoData['key']) . '</span>: ' . h($formInfoData['desc']) . '<br />",' . PHP_EOL;
 		}
 		echo '}' . PHP_EOL;
 	}
@@ -101,7 +102,7 @@ $(document).ready(function() {
 		if ($('#AttributeDistribution').val() == 4) $('#SGContainer').show();
 		else $('#SGContainer').hide();
 	});
-	
+
 	$("#AttributeCategory").on('change', function(e) {
 		formCategoryChanged('Attribute');
 		if ($(this).val() === 'Attribution' || $(this).val() === 'Targeting data') {
@@ -114,7 +115,7 @@ $(document).ready(function() {
 			$('#SGContainer').hide();
 		}
 	});
-	
+
 	$("#AttributeCategory, #AttributeType, #AttributeDistribution").change(function() {
 		initPopoverContent('Attribute');
 	});