Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java
===================================================================
diff -u -r77491c8baf27f5b5d8705ea6b306e8db142389e7 -r586c8780429a9489900952ef8ed3156ea0aac464
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java (.../LearningController.java) (revision 77491c8baf27f5b5d8705ea6b306e8db142389e7)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java (.../LearningController.java) (revision 586c8780429a9489900952ef8ed3156ea0aac464)
@@ -355,10 +355,10 @@
request.setAttribute("errorMap", errorMap);
switch (resourceItemForm.getItemType()) {
case 1:
- return "pages/authoring/parts/addurl";
+ return "pages/learning/addurl";
case 2:
resourceItemForm.setTmpFileUploadId(FileUtil.generateTmpFileUploadId());
- return "pages/authoring/parts/addfile";
+ return "pages/learning/addfile";
default:
throw new IllegalArgumentException("Unknown item type" + resourceItemForm.getItemType());
}
@@ -395,7 +395,7 @@
errorMap.add("GLOBAL",
messageService.getMessage("error.upload.failed", new Object[] { e.getMessage() }));
request.setAttribute("errorMap", errorMap);
- return "pages/authoring/parts/addurl";
+ return "pages/learning/addurl";
}
item.setOpenUrlNewWindow(resourceItemForm.isOpenUrlNewWindow());
} else {
Index: lams_tool_larsrc/web/pages/learning/addfile.jsp
===================================================================
diff -u -r80f23aae24a17df9dfcd1770f396aaba0d0650c3 -r586c8780429a9489900952ef8ed3156ea0aac464
--- lams_tool_larsrc/web/pages/learning/addfile.jsp (.../addfile.jsp) (revision 80f23aae24a17df9dfcd1770f396aaba0d0650c3)
+++ lams_tool_larsrc/web/pages/learning/addfile.jsp (.../addfile.jsp) (revision 586c8780429a9489900952ef8ed3156ea0aac464)
@@ -70,7 +70,24 @@
initFileUpload('${resourceItemForm.tmpFileUploadId}', extensionValidation, '');
});
- $('#resourceItemForm').submit(submitResourceForm);
+ $('#resourceItemForm').submit(submitResourceForm)
+ .validate({
+ errorClass: "text-danger",
+ wrapper: "span",
+ rules: {
+ title: {
+ required: true
+ }
+ },
+ messages : {
+ title : {
+ required : ' '
+ }
+ },
+ errorPlacement: function(error, element) {
+ error.insertAfter(element);
+ }
+ });
Index: lams_tool_larsrc/web/pages/learning/learning.jsp
===================================================================
diff -u -rd5fa41792bdb2657d0d53c35126a64604510d18a -r586c8780429a9489900952ef8ed3156ea0aac464
--- lams_tool_larsrc/web/pages/learning/learning.jsp (.../learning.jsp) (revision d5fa41792bdb2657d0d53c35126a64604510d18a)
+++ lams_tool_larsrc/web/pages/learning/learning.jsp (.../learning.jsp) (revision 586c8780429a9489900952ef8ed3156ea0aac464)
@@ -71,7 +71,6 @@
});
function submitResourceForm() {
- clearFileError();
if ( $(this).valid() ) {
$('.btn-disable-on-submit').prop('disabled', true);
var formData = new FormData(this);