From 202d304e02cbc32f43fab339e262695c4c3fd38a Mon Sep 17 00:00:00 2001 From: srosse <none@none> Date: Tue, 17 Jun 2014 14:47:17 +0200 Subject: [PATCH] OO-1107: show a message if the repository entry doesn't exists --- .../org/olat/course/nodes/iq/IQEditController.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/olat/course/nodes/iq/IQEditController.java b/src/main/java/org/olat/course/nodes/iq/IQEditController.java index 5761818573f..bea125e9508 100644 --- a/src/main/java/org/olat/course/nodes/iq/IQEditController.java +++ b/src/main/java/org/olat/course/nodes/iq/IQEditController.java @@ -493,11 +493,12 @@ public class IQEditController extends ActivateableTabbableDefaultController impl } else {//survey types = new String[]{SurveyFileResource.TYPE_NAME}; } - //look if there are PASSED entries in changelog - //if yes create archive of results and all users can be notified about the changed test configuration - String repositorySoftKey = (String) courseNode.getModuleConfiguration().get(IQEditController.CONFIG_KEY_REPOSITORY_SOFTKEY); - Long repKey = RepositoryManager.getInstance().lookupRepositoryEntryBySoftkey(repositorySoftKey, true).getKey(); + RepositoryEntry re = courseNode.getReferencedRepositoryEntry(); + if(re == null) { + showError("error.test.undefined.long", courseNode.getShortTitle()); + return; + } if (moduleConfiguration.get(CONFIG_KEY_TYPE_QTI) == null) { updateQtiType(re); @@ -512,7 +513,7 @@ public class IQEditController extends ActivateableTabbableDefaultController impl onyxSuccess = surveyDir.listFiles().length; } } else { - onyxSuccess = QTIResultManager.getInstance().countResults(course.getResourceableId(), courseNode.getIdent(), repKey); + onyxSuccess = QTIResultManager.getInstance().countResults(course.getResourceableId(), courseNode.getIdent(), re.getKey()); } } if (moduleConfiguration.get(CONFIG_KEY_TYPE_QTI) != null @@ -522,7 +523,7 @@ public class IQEditController extends ActivateableTabbableDefaultController impl replaceWizard.addControllerListener(this); cmc = new CloseableModalController(getWindowControl(), translate("close"), replaceWizard.getInitialComponent()); } else { - List<QTIResult> results = QTIResultManager.getInstance().selectResults(course.getResourceableId(), courseNode.getIdent(), repKey, null, 1); + List<QTIResult> results = QTIResultManager.getInstance().selectResults(course.getResourceableId(), courseNode.getIdent(), re.getKey(), null, 1); // test was passed from an user boolean passed = (results != null && results.size() > 0) ? true : false; // test was started and not passed -- GitLab