Merge authors:
Stian Sandvold (stian-sandvold)
------------------------------------------------------------
revno: 20558 [merge]
committer: Stian Sandvold <stian.sandv...@gmail.com>
branch nick: dhis2
timestamp: Wed 2015-10-07 10:43:13 +0200
message:
When uploading files, the file parameter is now required. The response after
uploading a file is now HttpStatus.NO_CONTENT, the same as AppController
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/StaticContentController.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/StaticContentController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/StaticContentController.java 2015-10-06 18:24:42 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/StaticContentController.java 2015-10-07 08:36:33 +0000
@@ -50,10 +50,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.util.MimeType;
import org.springframework.util.MimeTypeUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import com.google.common.collect.ImmutableMap;
@@ -150,10 +147,11 @@
* @throws WebMessageException
* @throws IOException
*/
+ @ResponseStatus( HttpStatus.NO_CONTENT )
@RequestMapping( value = "/{key}", method = RequestMethod.POST )
public void updateStaticContent(
@PathVariable( "key" ) String key,
- @RequestParam( value = "file", required = false ) MultipartFile file )
+ @RequestParam( value = "file", required = true ) MultipartFile file )
throws WebMessageException, IOException
{
if ( file == null || file.isEmpty() )
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
