Index: lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveController.java
===================================================================
diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r4b281aa2685bb05bee4c6d7573dc785e406df5dc
--- lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveController.java (.../KumaliveController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveController.java (.../KumaliveController.java) (revision 4b281aa2685bb05bee4c6d7573dc785e406df5dc)
@@ -50,9 +50,9 @@
private static Logger log = Logger.getLogger(KumaliveController.class);
@Autowired
- private static IKumaliveService kumaliveService;
+ private IKumaliveService kumaliveService;
@Autowired
- private static ISecurityService securityService;
+ private ISecurityService securityService;
@RequestMapping("/getRubrics")
public String getRubrics(HttpServletRequest request, HttpServletResponse response) throws IOException {
@@ -283,11 +283,9 @@
response.addCookie(fileDownloadTokenCookie);
ExcelUtil.createExcel(response.getOutputStream(), dataToExport, "Exported on:", true);
-
}
@RequestMapping("/saveRubrics")
- @ResponseBody
public void saveRubrics(HttpServletRequest request, HttpServletResponse response) throws IOException {
UserDTO userDTO = getUserDTO();
Integer userId = userDTO.getUserID();
@@ -306,7 +304,6 @@
ArrayNode rubricsJSON = JsonUtil.readArray(WebUtil.readStrParam(request, "rubrics"));
kumaliveService.saveRubrics(organisationId, rubricsJSON);
-
}
private UserDTO getUserDTO() {
Index: lams_learning/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5 -r4b281aa2685bb05bee4c6d7573dc785e406df5dc
--- lams_learning/web/WEB-INF/spring-servlet.xml (.../spring-servlet.xml) (revision 6f37a4eb8b2023d6e6dffceffa91ebdbf74c54f5)
+++ lams_learning/web/WEB-INF/spring-servlet.xml (.../spring-servlet.xml) (revision 4b281aa2685bb05bee4c6d7573dc785e406df5dc)
@@ -8,6 +8,7 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-4.3.xsd">
+