Skip to content

Commit df8bb51

Browse files
committed
- fix static header in generic dialog
- fix export dialog not opening
1 parent d2134c8 commit df8bb51

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

app/assets/javascripts/exercises.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,7 @@ $(document).on('turbolinks:load', function () {
355355
}
356356

357357
var exportExerciseStart = function (exerciseID) {
358+
$('#transfer-modal .modal-title').html(I18n.t('exercises.export_codeharbor.dialogtitle'));
358359
const $exerciseDiv = $('#exercise-transfer');
359360
const $messageDiv = $exerciseDiv.children('.transfer-message');
360361
const $actionsDiv = $exerciseDiv.children('.transfer-exercise-actions');
@@ -448,6 +449,7 @@ $(document).on('turbolinks:load', function () {
448449
});
449450
}
450451
var importExerciseStart = function () {
452+
$('#transfer-modal .modal-title').html(I18n.t('exercises.import_proforma.label'));
451453
const $exerciseDiv = $('#exercise-transfer');
452454
const $messageDiv = $exerciseDiv.children('.transfer-message');
453455
const $actionsDiv = $exerciseDiv.children('.transfer-exercise-actions');

app/views/exercises/index.html.slim

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ h1 = Exercise.model_name.human(count: :other)
5353
li = link_to(ProgrammingGroup.model_name.human(count: :other), exercise_programming_groups_path(exercise), class: 'dropdown-item') if policy(exercise).programming_groups_for_exercise?
5454
li = link_to(t('shared.destroy'), exercise, data: {confirm: t('shared.confirm_destroy')}, method: :delete, class: 'dropdown-item') if policy(exercise).destroy?
5555
li = link_to(t('.clone'), clone_exercise_path(exercise), data: {confirm: t('shared.confirm_destroy')}, method: :post, class: 'dropdown-item') if policy(exercise).clone?
56-
li = link_to(t('exercises.export_codeharbor.label'), '', class: 'dropdown-item export-start', data: {'exercise-id': exercise.id}) if policy(exercise).export_external_confirm?
56+
li = link_to(t('exercises.export_codeharbor.label'), '', class: 'dropdown-item export-start', data: {'exercise-id': exercise.id, 'bs-toggle': 'modal', 'bs-target': '#transfer-modal'}) if policy(exercise).export_external_confirm?
5757
li = link_to(t('exercises.download_proforma.label'), download_proforma_exercise_path(exercise), class: 'dropdown-item', target: '_blank', rel: 'noopener noreferrer') if policy(exercise).download_proforma?
5858

5959
= render('shared/pagination', collection: @exercises)
@@ -65,6 +65,5 @@ p
6565
= t('exercises.import_proforma.label')
6666

6767
= render 'shared/modal',
68-
title: t('exercises.export_codeharbor.dialogtitle'),
6968
modal_root_attributes: {id: 'transfer-modal'},
7069
template: 'exercises/_transfer_dialogcontent'

0 commit comments

Comments
 (0)