Index: lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java =================================================================== diff -u -rb8e54021b464f3abf023581e819cee4d4a54f26e -rfdbc571c3083fb0966a3fb4556ed7c21d0315fc1 --- lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java (.../OutcomeController.java) (revision b8e54021b464f3abf023581e819cee4d4a54f26e) +++ lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java (.../OutcomeController.java) (revision fdbc571c3083fb0966a3fb4556ed7c21d0315fc1) @@ -292,11 +292,12 @@ return String.valueOf(outcomeMapping.getMappingId()); } - @RequestMapping(path = "/outcomeGetMappings", produces = "application/json;charset=utf-8") + @RequestMapping(path = "/outcomeGetMappings") @ResponseBody public String outcomeGetMappings(@RequestParam(required = false) Long lessonId, @RequestParam(required = false) Long toolContentId, @RequestParam(required = false) Long itemId, - @RequestParam(required = false) Integer qbQuestionId, HttpServletRequest request) throws Exception { + @RequestParam(required = false) Integer qbQuestionId, HttpServletRequest request, + HttpServletResponse response) throws Exception { if (lessonId == null && toolContentId == null && qbQuestionId == null) { throw new IllegalArgumentException( "Either lesson ID or tool content ID or QB question ID must not be null when fetching outcome mappings"); @@ -323,6 +324,8 @@ outcome.getName() + (StringUtils.isBlank(outcome.getCode()) ? "" : " (" + outcome.getCode() + ")")); responseJSON.add(outcomeJSON); } + + response.setContentType("application/json;charset=utf-8"); return responseJSON.toString(); } @@ -338,7 +341,6 @@ } } - @SuppressWarnings("unchecked") @RequestMapping("/outcomeSetResult") @ResponseBody public String outcomeSetResult(HttpServletRequest request, HttpServletResponse response) throws Exception {