fix #204: delete setting at system level

alfio-event · Sep 16, 2016 · 52ac947 · 52ac947
1 parent 510069f
commit 52ac947
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/main/webapp/resources/js/admin/feature/configuration/configuration.js b/src/main/webapp/resources/js/admin/feature/configuration/configuration.js
@@ -75,7 +75,7 @@
             updateCategoryConfig: function(categoryId, eventId, settings) {
                 return $http.post('/admin/api/configuration/events/'+eventId+'/categories/'+categoryId+'/update', settings).error(HttpErrorHandler.handle);
             },
-            remove: function(conf) {
+            removeSystemConfig: function(conf) {
                 return $http['delete']('/admin/api/configuration/key/' + conf.configurationKey).error(HttpErrorHandler.handle);
             },
             removeOrganizationConfig: function(conf, organizationId) {
@@ -179,7 +179,7 @@
         };
 
         systemConf.delete = function(config) {
-            return ConfigurationService.remove(config);
+            return ConfigurationService.removeSystemConfig(config);
         };
 
         $rootScope.$on('ReloadSettings', function() {
@@ -192,9 +192,6 @@
     function OrganizationConfigurationController(ConfigurationService, OrganizationService, $stateParams, $q, $rootScope) {
         var organizationConf = this;
         organizationConf.organizationId = $stateParams.organizationId;
-        organizationConf.delete = function(config) {
-            return ConfigurationService.removeOrganizationConfig(config, organizationConf.organizationId);
-        };
         var load = function() {
             organizationConf.loading = true;
             $q.all([OrganizationService.getOrganization(organizationConf.organizationId), ConfigurationService.loadOrganizationConfig(organizationConf.organizationId)])