fixes #1348 #1347 #1345 #1344

ChurchCRM · Nov 13, 2016 · 5d89021 · 5d89021
1 parent 3895e92
commit 5d89021
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/src/mysql/upgrade.json b/src/mysql/upgrade.json
@@ -68,14 +68,15 @@
     ],
     "dbVersion": "2.3.0"
   },
-  "pre-2.3.3" : {
+  "pre-2.3.4" : {
     "versions": [
       "2.3.0",
       "2.3.1",
-      "2.3.2"
+      "2.3.2",
+      "2.3.3"
     ],
     "scripts": [
     ],
-    "dbVersion": "2.3.3"
+    "dbVersion": "2.3.4"
   }
 }
diff --git a/src/skin/js/DepositSlipEditor.js b/src/skin/js/DepositSlipEditor.js
@@ -136,7 +136,7 @@ function initDepositSlipEditor()
     }
   });
 
-  $(".paymentRow").on('click', function() {
+  $(document).on('click',".paymentRow", function() {
     if (! ($(event.target).hasClass("details-control") || $(event.target).hasClass("fa")))
     {
       $(this).toggleClass('selected');
@@ -159,7 +159,7 @@ function initDepositSlipEditor()
     $.each(deletedRows, function(index, value) {
       $.ajax({
         type: 'POST', // define the type of HTTP verb we want to use (POST for our form)
-        url: window.CRM.root+'/api/payments/' + value.plg_GroupKey, // the url where we want to POST
+        url: window.CRM.root+'/api/payments/' + value.Groupkey, // the url where we want to POST
         dataType: 'json', // what type of data do we expect back from the server
         data: {"_METHOD":"DELETE"},
         encode: true

diff --git a/src/skin/js/GroupList.js b/src/skin/js/GroupList.js
@@ -22,6 +22,7 @@ $(document).ready(function () {
       }).done(function (data) {                               //yippie, we got something good back from the server
         dataT.row.add(data);                                //add the group data to the existing DataTable
         dataT.rows().invalidate().draw(true);               //redraw the dataTable
+        $("#groupName").val(null);
       });
     }
     else

diff --git a/src/skin/js/GroupView.js b/src/skin/js/GroupView.js
@@ -79,8 +79,8 @@ $(document).ready(function() {
       var person = data.Person2group2roleP2g2rs[0];
       var node = dataT.row.add(person).node();
       dataT.rows().invalidate().draw(true);
+      $(".personSearch").val(null).trigger('change')
     });
-    $(".personSearch").select2("val", "");
   });
 
   $("#chkClear").change(function(){
@@ -204,7 +204,7 @@ $(document).ready(function() {
       }
     }).data().firstName);
     $('#changeMembership').modal('show');
-
+    e.stopPropagation();
   });
 
   $(document).on("click", "#confirmMembershipChange", function(e) {
@@ -289,10 +289,13 @@ function initDataTable()
     ],
     "fnDrawCallback":function(oSettings) {
       $("#iTotalMembers").text(oSettings.aoData.length);
+    },
+    "createdRow" : function (row,data,index) {
+      $(row).addClass("groupRow");
     }
   });
 
-  $("#membersTable tbody").on('click', 'tr', function() {
+  $(document).on('click', '.groupRow', function() {
     $(this).toggleClass('selected');
     var selectedRows = dataT.rows('.selected').data().length;
     $("#deleteSelectedRows").prop('disabled', !(selectedRows));