From 835d882e938387b316dcaf9699d022f5abacaf4d Mon Sep 17 00:00:00 2001 From: Ben Rothman Date: Thu, 25 Jun 2015 11:18:06 -0500 Subject: [PATCH] exec points entered as committee points, fixed issue with admin page not displaying current committee points --- js/pointsCenter.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/js/pointsCenter.js b/js/pointsCenter.js index 5124693..f7d36f5 100644 --- a/js/pointsCenter.js +++ b/js/pointsCenter.js @@ -1796,9 +1796,13 @@ define(['jquery', 'moment', 'hogan'], function($, moment, Hogan){ destroyTypeahead); $('[data-edit-committee]').on('click', function(){ - $('.committee-points').val(0).show(); + var committee = $('#edit-committee').val(); + + $('.committee-points').val(0).show() + .attr('max', (committee == 'Exec' ? 40 : 20)); + $('#editCommitteeOrSuite').data('is-committee', true); - $.getJSON(root + '/ajax/getCommitteeOrSuite.php', { committee: $('#edit-committee').val() }, admin.addSlivkans); + $.getJSON(root + '/ajax/getCommitteeOrSuite.php', { committee: committee }, admin.addSlivkans); }); $('[data-edit-suite]').on('click', function(){ @@ -1934,8 +1938,8 @@ define(['jquery', 'moment', 'hogan'], function($, moment, Hogan){ entry = entries.eq(i); name = slivkans[slivkans.indexOfKey('nu_email', data[i].nu_email)].full_name; entry.find('.slivkan-entry').val(name); - if(data[i].committee){ - entry.find('.committee-points').val(data[i].committee); + if(data[i].points){ + entry.find('.committee-points').val(data[i].points); } admin.validateSlivkanName(entry); }