Fixed some JS issues

Didn't search for classes correctly
Kaezon · Apr 15, 2016 · d6e896d · d6e896d
1 parent 86065f2
commit d6e896d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 21 deletions.
diff --git a/static/js/orders.js b/static/js/orders.js
@@ -2,25 +2,26 @@ var orderModal = $('#newOrderModal')
 var orderForm =  $('#orderForm');
 $( document ).ready(
     orderForm.submit(function() {
+        orderModal.find(".modalResponse").first().empty().attr('class','modalResponse');
         $.ajax({
             type: orderForm.attr('method'),
             url: orderForm.attr('action'),
             data: orderForm.serialize(),
             success: function(data) {
-                  orderModal.modal('hide')
-                  location.reload()
+                  orderModal.modal('hide');
+                  location.reload();
             },
             error: function(data) {
-                $("#orderModalResponse").empty().append('<a href="#" class="close" data-dismiss="alert">&times;</a>')
-                $("#orderModalResponse").append(data.responseText)
-                $("#orderModalResponse").addClass("alert alert-danger fade in");
+                orderModal.find(".modalResponse").first().empty().append('<a href="#" class="close" data-dismiss="alert">&times;</a>');
+                orderModal.find(".modalResponse").first().append(data.responseText);
+                orderModal.find(".modalResponse").first().addClass("alert alert-danger fade in");
             }
         });
         return false;
     }),
-    $("modal").each( function() {
+    $(".modal").each( function() {
         $(this).on('hidden.bs.modal', function () {
-            $(this).children(".modalResponse").empty().attr('class','modalResponse')
+            $(this).find(".modalResponse").first().empty().attr('class','modalResponse');
         })
     })
 );
diff --git a/static/js/stock.js b/static/js/stock.js
@@ -3,43 +3,45 @@ var addStockModal = $('#addStockModal')
 var itemForm =  $('#addItemForm');
 var stockForm = $('#addStockForm');
 $( document ).ready(
-    itemForm.submit(function() {
+    addItemModal.submit(function() {
+        addItemModal.find(".modalResponse").first().empty().attr('class','modalResponse');
         $.ajax({
             type: itemForm.attr('method'),
             url: itemForm.attr('action'),
             data: itemForm.serialize(),
             success: function(data) {
-                  addItemModal.modal('hide')
-                  location.reload()
+                  addItemModal.modal('hide');
+                  location.reload();
             },
             error: function(data) {
-                itemForm.children(".modalResponse").empty().append('<a href="#" class="close" data-dismiss="alert">&times;</a>')
-                itemForm.children(".modalResponse").append(data.responseText)
-                itemForm.children(".modalResponse").addClass("alert alert-danger fade in");
+                addItemModal.find(".modalResponse").first().empty().append('<a href="#" class="close" data-dismiss="alert">&times;</a>');
+                addItemModal.find(".modalResponse").first().append(data.responseText);
+                addItemModal.find(".modalResponse").first().addClass("alert alert-danger fade in");
             }
         });
         return false;
     }),
     stockForm.submit(function() {
+        addStockModal.find(".modalResponse").first().empty().attr('class','modalResponse');
         $.ajax({
             type: stockForm.attr('method'),
             url: stockForm.attr('action'),
             data: stockForm.serialize(),
             success: function(data) {
-                  addStockModal.modal('hide')
-                  location.reload()
+                  addStockModal.modal('hide');
+                  location.reload();
             },
             error: function(data) {
-                stockForm.children(".modalResponse").empty().append('<a href="#" class="close" data-dismiss="alert">&times;</a>')
-                stockForm.children(".modalResponse").append(data.responseText)
-                stockForm.children(".modalResponse").addClass("alert alert-danger fade in");
+                addStockModal.find(".modalResponse").first().empty().append('<a href="#" class="close" data-dismiss="alert">&times;</a>');
+                addStockModal.find(".modalResponse").first().append(data.responseText);
+                addStockModal.find(".modalResponse").first().addClass("alert alert-danger fade in");
             }
         });
         return false;
     }),
-    $("modal").each( function() {
+    $(".modal").each( function() {
         $(this).on('hidden.bs.modal', function () {
-            $(this).children(".modalResponse").empty().attr('class','modalResponse')
+            $(this).find(".modalResponse").first().empty().attr('class','modalResponse');
         })
     })
 );
diff --git a/templates/public/orders.html b/templates/public/orders.html
@@ -73,7 +73,7 @@ <h1 class="page-header text-center">Orders</h1>
                     <button type="button" class="close" data-dismiss="modal">&times;</button>
                     <h4 class="modal-title">Add New Order</h4>
                 </div>
-                <div id="orderModalResponse"></div>
+                <div class="modalResponse"></div>
                 <div class="modal-body">
                     <form id="orderForm" method="post" action="">
                         {% csrf_token %}