diff --git a/test/test_server.py b/test/test_server.py index a7ed8d3..963b6b3 100644 --- a/test/test_server.py +++ b/test/test_server.py @@ -199,7 +199,7 @@ def test_get_region_list(self): 'regions': [ { 'id': 'norcal', - 'activeTF': True, + 'is_active': True, 'display_name': 'Norcal', 'ranking_num_tourneys_attended': 2, 'ranking_activity_day_limit': 60, @@ -207,7 +207,7 @@ def test_get_region_list(self): }, { 'id': 'texas', - 'activeTF': True, + 'is_active': True, 'display_name': 'Texas', 'ranking_num_tourneys_attended': 2, 'ranking_activity_day_limit': 60, @@ -223,7 +223,7 @@ def test_get_region_list(self): def test_change_region_active_flag(self, mock_admin_user): data = { 'region_id': 'norcal', - 'activeTF': 'false' + 'is_active': 'false' } response = self.app.post('/regions', data=json.dumps(data), content_type='application/json') diff --git a/webapp/app/tools/admin_functions/controllers/adminFunctions.controller.js b/webapp/app/tools/admin_functions/controllers/adminFunctions.controller.js index 819f3e3..81b21a7 100644 --- a/webapp/app/tools/admin_functions/controllers/adminFunctions.controller.js +++ b/webapp/app/tools/admin_functions/controllers/adminFunctions.controller.js @@ -44,17 +44,17 @@ angular.module('app.tools').controller("AdminFunctionsController", function($sco $scope.changeRegionActiveTF = function(region){ var region_id = region.id; - var newActiveTF = !(region.activeTF) + var newIsActive = !(region.is_active) var url = hostname + 'regions'; var postParams = { region_id: region_id, - activeTF: newActiveTF + is_active: newIsActive } $scope.sessionService.authenticatedPost(url, postParams, (data)=>{ - //alert(region_id + ' active flag changed to ' + newActiveTF + '!'); + //alert(region_id + ' active flag changed to ' + newIsActive + '!'); // TODO refresh the scope updateRegions(); $scope.regionService.updateRegionDropdown(); diff --git a/webapp/app/tools/admin_functions/views/admin_functions.html b/webapp/app/tools/admin_functions/views/admin_functions.html index 71a93e5..e6e3b17 100644 --- a/webapp/app/tools/admin_functions/views/admin_functions.html +++ b/webapp/app/tools/admin_functions/views/admin_functions.html @@ -36,10 +36,10 @@

Activation

{{r.display_name}} - {{r.activeTF}} + {{r.is_active}} -
+