Skip to content
Snippets Groups Projects
Commit 59561355 authored by srosse's avatar srosse
Browse files

OO-2613: show an error if a assessmentItem file is missing in a test and allow to delete it

parent e6a2a1e9
No related branches found
No related tags found
No related merge requests found
......@@ -117,7 +117,8 @@ public class AssessmentItemEditorController extends BasicController {
this.restrictedEdit = restrictedEdit;
this.resolvedAssessmentItem = resolvedAssessmentItem;
if(resolvedAssessmentItem == null) {
if(resolvedAssessmentItem == null || resolvedAssessmentItem.getItemLookup() == null
|| resolvedAssessmentItem.getItemLookup().getRootNodeHolder() == null) {
mainVC = createVelocityContainer("missing_resource");
mainVC.contextPut("uri", itemFile == null ? "" : itemFile);
} else {
......@@ -155,7 +156,8 @@ public class AssessmentItemEditorController extends BasicController {
this.restrictedEdit = restrictedEdit;
this.resolvedAssessmentItem = resolvedAssessmentItem;
if(resolvedAssessmentItem == null) {
if(resolvedAssessmentItem == null || resolvedAssessmentItem.getItemLookup() == null
|| resolvedAssessmentItem.getItemLookup().getRootNodeHolder() == null) {
mainVC = createVelocityContainer("missing_resource");
mainVC.contextPut("uri", itemFile == null ? "" : itemFile);
} else {
......
......@@ -111,7 +111,8 @@ public class AssessmentTestEditorAndComposerTreeModel extends GenericTreeModel i
private TreeNode buildRecursively(AssessmentItemRef itemRef, TreeNode parentNode) {
GenericTreeNode itemNode = new GenericTreeNode(itemRef.getIdentifier().toString());
ResolvedAssessmentItem resolvedAssessmentItem = resolvedAssessmentTest.getResolvedAssessmentItem(itemRef);
if(resolvedAssessmentItem == null || resolvedAssessmentItem.getItemLookup() == null) {
if(resolvedAssessmentItem == null || resolvedAssessmentItem.getItemLookup() == null
|| resolvedAssessmentItem.getItemLookup().getRootNodeHolder() == null) {
itemNode.setTitle("ERROR - Not found");
itemNode.setIconCssClass("o_icon o_icon_error");
itemNode.setUserObject(itemRef);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment