Skip to content

Commit

Permalink
Merge branch 'release-20.7.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions committed Feb 1, 2024
2 parents f13ba2a + 4408a6b commit 091d312
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"oat-sa/oatbox-extension-installer": "~1.1||dev-master",
"sinergi/browser-detector": "^6.0.2",
"oat-sa/generis" : ">=15.22",
"oat-sa/tao-core" : ">=50.24.6",
"oat-sa/tao-core" : ">=54.0.0",
"oat-sa/extension-tao-delivery-rdf" : ">=14.0.0",
"oat-sa/extension-tao-delivery" : ">=15.0.0",
"oat-sa/extension-tao-eventlog" : ">=3.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ define([
_.merge(this.config.assessments, data);

// Update the template variables
_.each(this.config.assessments, function(val) {
_.forEach(this.config.assessments, function(val) {
$('.' + val.container, this.getElement())
.text(val.value);
}, this);
Expand Down
2 changes: 1 addition & 1 deletion views/js/controller/Delivery/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ define([
.on('ok', function (reason) {
proxySessions.action('pause', {
delivery: deliveryId,
execution: _.pluck(selection, 'id'),
execution: _.map(selection, 'id'),
reason: reason
}).then(function() {
feedback().success('Selected deliveries successfully paused');
Expand Down
6 changes: 3 additions & 3 deletions views/js/controller/Delivery/monitoring.js
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ define([
config.categoriesSelector = cascadingComboBox(categories[actionName]);
}

_.each(_selection, function (uri) {
_.forEach(_selection, function (uri) {
const deliveryExecutionData = getExecutionData(uri);
if (deliveryExecutionData.hasOwnProperty('lastPauseReason')) {
config['predefinedReason'] = deliveryExecutionData['lastPauseReason'];
Expand Down Expand Up @@ -562,7 +562,7 @@ define([
var allowedDeliveries = [];
var forbiddenDeliveries = [];

_.each(selection, function (uri) {
_.forEach(selection, function (uri) {
var testTakerData = getExecutionData(uri);
var checkedDelivery;
if(testTakerData){
Expand Down Expand Up @@ -931,7 +931,7 @@ define([
}

//extra fields
_.each(extraFields, function(extraField){
_.forEach(extraFields, function(extraField){
model.push({
id : extraField.id,
label: extraField.label,
Expand Down
2 changes: 1 addition & 1 deletion views/js/loader/taoProctoring.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/js/loader/taoProctoring.min.js.map

Large diffs are not rendered by default.

0 comments on commit 091d312

Please sign in to comment.