Skip to content
Snippets Groups Projects
Commit 9caf5b92 authored by aboeckle's avatar aboeckle
Browse files

Merge branch 'OpenOLAT_14.2' of...

Merge branch 'OpenOLAT_14.2' of ssh://aboeckle@office.frentix.com/home/aboeckle/repositories/OpenOLAT.git into OpenOLAT_14.2
parents f9798322 9701b6c9
No related branches found
No related tags found
No related merge requests found
......@@ -508,7 +508,7 @@ public class FIBAssessmentItemBuilder extends AssessmentItemBuilder {
if(textEntry.getAlternatives() != null && !textEntry.getAlternatives().isEmpty()) {
for(TextEntryAlternative alternative:textEntry.getAlternatives()) {
double altScore = alternative.getScore();
if(altScore >= 0.0d && score != null && score.doubleValue() == altScore) {
if(altScore >= 0.0d && score != null && score.doubleValue() != altScore) {
return true;
}
}
......
......@@ -799,13 +799,13 @@ public class QuestionListController extends AbstractItemListController implement
}
private void doOpenImport(UserRequest ureq) {
String title = translate("import");
removeAsListenerAndDispose(calloutCtrl);
removeAsListenerAndDispose(importSourcesCtrl);
importSourcesCtrl = new ImportSourcesController(ureq, getWindowControl());
listenTo(importSourcesCtrl);
removeAsListenerAndDispose(calloutCtrl);
calloutCtrl = new CloseableCalloutWindowController(ureq, getWindowControl(), importSourcesCtrl.getInitialComponent(), importItem, title, true, null);
calloutCtrl = new CloseableCalloutWindowController(ureq, getWindowControl(), importSourcesCtrl.getInitialComponent(), importItem, null, true, null);
listenTo(calloutCtrl);
calloutCtrl.activate();
}
......
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