dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Nicolay Ramm (nicolayr)
------------------------------------------------------------
revno: 20593 [merge]
committer: Nicolay Ramm <nicolayr@xxxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-10-09 00:48:22 +0200
message:
  Support deleting feedback recipients
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ConfigurationController.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ConfigurationController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ConfigurationController.java	2015-10-06 14:23:01 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ConfigurationController.java	2015-10-08 22:27:07 +0000
@@ -113,6 +113,18 @@
         configurationService.setConfiguration( config );
     }
 
+    @PreAuthorize( "hasRole('ALL') or hasRole('F_SYSTEM_SETTING')" )
+    @ResponseStatus( value = HttpStatus.OK )
+    @RequestMapping( value = "/feedbackRecipients", method = RequestMethod.DELETE )
+    public void setFeedbackRecipients()
+    {
+        Configuration config = configurationService.getConfiguration();
+
+        config.setFeedbackRecipients( null );
+
+        configurationService.setConfiguration( config );
+    }
+
     @RequestMapping( value = "/offlineOrganisationUnitLevel", method = RequestMethod.GET )
     public String getOfflineOrganisationUnitLevel( Model model, HttpServletRequest request )
     {