Merge pull request #2452 from totten/lolas-freeform-CRM-14126

[civicrm-core.git] / templates / CRM / Batch / Form / Entry.js

diff --git a/templates/CRM/Batch/Form/Entry.js b/templates/CRM/Batch/Form/Entry.js
index 78ab8337de5b5ea380c4d3465c507c90f653fa6b..6b81bd19621a544cf7b1f50b09feb34ad4b4aee2 100644 (file)
--- a/templates/CRM/Batch/Form/Entry.js
+++ b/templates/CRM/Batch/Form/Entry.js
@@ -44,7 +44,7 @@ cj(function () {
   else{
     cj('select[id^="member_option_"]').each(function () {
       if (cj(this).val() == 1) {
-        cj(this).attr('disabled', true);
+        cj(this).prop('disabled', true);
       }
     });
 
@@ -95,7 +95,7 @@ function updateContactInfo(blockNo, prefix) {
       if(CRM.batch.type_id == 2) {
       CRM.api('Membership', 'get', {
           'sequential': '1',
-          'contact_id': contactId,
+          'contact_id': contactId
         },
         { success: function (data) {
           if (data.count > 0) {
@@ -108,7 +108,7 @@ function updateContactInfo(blockNo, prefix) {
               },
               { success: function (data) {
                 var memTypeContactId = data.values[0].member_of_contact_id;
-                cj('select[id="member_option_' + blockNo + '"]').removeAttr('disabled').val(2);
+                cj('select[id="member_option_' + blockNo + '"]').prop('disabled', false).val(2);
                 cj('select[id="field_' + blockNo + '_membership_type_0"]').val(memTypeContactId).change();
                 cj('select[id="field_' + blockNo + '_membership_type_1"]').val(membershipTypeId).change();
                 setDateFieldValue('join_date', membershipJoinDate, blockNo)