From 94c1c2d5478d75beab05b2bd8c5fbda4fd141ed2 Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Thu, 19 Feb 2015 16:57:32 -0500
Subject: [PATCH] fixed loading mock data

---
 public/src/admin/extend/rewards.js | 12 ++++++++----
 src/rewards/admin.js               |  2 +-
 src/views/admin/extend/rewards.tpl |  8 ++++----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/public/src/admin/extend/rewards.js b/public/src/admin/extend/rewards.js
index 511a3b6ec3..2c31124032 100644
--- a/public/src/admin/extend/rewards.js
+++ b/public/src/admin/extend/rewards.js
@@ -9,11 +9,15 @@ define('admin/extend/rewards', function() {
 		active;
 
 	rewards.init = function() {
-		available = JSON.parse($('#rewards').val());
-		active = JSON.parse($('#active').val());
+		//available = JSON.parse($('#rewards').val());
+		//active = JSON.parse($('#active').val());
 
-		$('[data-selected]').each(function() {
-			$(this).val($(this).attr('data-selected'));
+
+		$(window).on('action:ajaxify.end', function() {
+			$('[data-selected]').each(function() {
+				console.log($(this).attr('data-selected'));
+				$(this).val($(this).attr('data-selected'));
+			});
 		});
 	};
 
diff --git a/src/rewards/admin.js b/src/rewards/admin.js
index ff0a56ff9c..ebc2b95a95 100644
--- a/src/rewards/admin.js
+++ b/src/rewards/admin.js
@@ -43,7 +43,7 @@ rewards.get = function(callback) {
 		],
 		active: [
 			{
-				"rewardID": 0,
+				"rewardID": 1,
 				"condition": "postcount",
 				"conditional": "greaterthan",
 				"value": 100,
diff --git a/src/views/admin/extend/rewards.tpl b/src/views/admin/extend/rewards.tpl
index 538ac93b39..7ff08995b9 100644
--- a/src/views/admin/extend/rewards.tpl
+++ b/src/views/admin/extend/rewards.tpl
@@ -8,9 +8,9 @@
 						<!-- BEGIN active -->
 						<li>
 							If User's
-							<select name="condition">
+							<select name="condition" data-selected="{active.condition}">
 								<!-- BEGIN conditions -->
-								<option value="{conditions.condition}" data-selected="{active.condition}">{conditions.name}</option>
+								<option value="{conditions.condition}">{conditions.name}</option>
 								<!-- END conditions -->
 							</select>
 							Is
@@ -30,8 +30,8 @@
 						<!-- END active -->
 					</ul>
 				</form>
-				<input type="hidden" id="rewards" value="{function.stringify, rewards}" />
-				<input type="hidden" id="active" value="{function.stringify, active}" />
+				<input type="hidden" name="rewards" value="{function.stringify, rewards}" />
+				<input type="hidden" name="active" value="{function.stringify, active}" />
 			</div>
 		</div>
 	</div>