Form submission works for task list widget.

mrtopher · Jun 28, 2013 · 31f5e7a · 31f5e7a
1 parent 61ce53c
commit 31f5e7a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/themes/third_party/dashee/js/dashee.js b/themes/third_party/dashee/js/dashee.js
@@ -498,7 +498,7 @@ $(function() {
 	}, this));
 
 	// Event to handle widget form submissions.
-	$('.wgt_form').on('submit', function (e) {
+	$(document).on('submit', '.wgt_form', function (e) {
 		e.preventDefault();
 
 		var $widget = $(this).parents('li');
@@ -510,10 +510,15 @@ $(function() {
 			data: $(this).serialize() + '&wgtid=' + $widget_id,
 			success: function(html) {
 				var $result = $.parseJSON(html);
-				$('h2', $widget).html($result.title);
-				$widget.find('.widget-content').html($result.content);
 
-				$.ee_notice($result.message, {type: 'success', open: true});
+				if($result.type == 'success') {
+					$('h2', $widget).html($result.title);
+					$widget.find('.widget-content').html($result.content);
+					$.ee_notice($result.message, {type: 'success', open: true});
+				}
+				else {
+					$.ee_notice($result.message, {type: 'error', open: true});
+				}
 			},
 			error: function(html) {
 				$.ee_notice("Nope, there was a problem.", {type: 'error', open: true});

diff --git a/third_party/dashee/mcp.dashee.php b/third_party/dashee/mcp.dashee.php
@@ -799,18 +799,22 @@ public function ajax_widget_proxy()
 
 			$content = $obj->index(@json_decode($this->_widgets[$wgtid]['stng']));
 			$result = array(
+				'type'		=> 'success',
 				'title'		=> $obj->title,
 				'content' 	=> $content,
 				'message'	=> $message
 				);
-
-			echo json_encode($result);
-			exit();
 		}
 		else
 		{
-			echo 'aw crap';
+			$result = array(
+				'type'		=> 'failure',
+				'message'	=> 'Something went wrong.'
+				);
 		}
+
+		echo json_encode($result);
+		exit();
 	}
 
 	/**