Index: idea_project/.idea/ktor.xml
===================================================================
diff -u
--- idea_project/.idea/ktor.xml (revision 0)
+++ idea_project/.idea/ktor.xml (revision f7fd0521036524de08176d1827dbb92d42f73a54)
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
===================================================================
diff -u -r24e5af6213a4fa2fe6531a1c7dec78df2110c0d0 -rf7fd0521036524de08176d1827dbb92d42f73a54
--- lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java (.../QbCollectionController.java) (revision 24e5af6213a4fa2fe6531a1c7dec78df2110c0d0)
+++ lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java (.../QbCollectionController.java) (revision f7fd0521036524de08176d1827dbb92d42f73a54)
@@ -188,7 +188,7 @@
public ResponseEntity addCollection(@RequestParam String name) {
if (!Configuration.getAsBoolean(ConfigurationKeys.QB_COLLECTIONS_CREATE_ALLOW)) {
log.error("Trying to create a new collection when it is disabled: " + name);
- return ResponseEntity.status(HttpStatus.FORBIDDEN).body("-1");
+ return ResponseEntity.status(HttpStatus.FORBIDDEN).body("Creating QB collections is disabled");
}
QbCollection collection = qbService.addCollection(getUserId(), name);
return ResponseEntity.ok(collection.getUid().toString());
Index: lams_central/web/questions/questionChoice.jsp
===================================================================
diff -u -r24e5af6213a4fa2fe6531a1c7dec78df2110c0d0 -rf7fd0521036524de08176d1827dbb92d42f73a54
--- lams_central/web/questions/questionChoice.jsp (.../questionChoice.jsp) (revision 24e5af6213a4fa2fe6531a1c7dec78df2110c0d0)
+++ lams_central/web/questions/questionChoice.jsp (.../questionChoice.jsp) (revision f7fd0521036524de08176d1827dbb92d42f73a54)
@@ -1,5 +1,8 @@
<%@ include file="/common/taglibs.jsp"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration" %>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
+<%=Configuration.get(ConfigurationKeys.QB_COLLECTIONS_CREATE_ALLOW)%>
@@ -163,6 +166,9 @@
if (!isNaN(response)) {
newCollectionUid = +response;
}
+ },
+ error : function (xhr) {
+ alert(xhr.status);
}
});
}
@@ -222,7 +228,9 @@
-
+
+
+