Skip to content
Snippets Groups Projects
Commit 6fa8ba85 authored by Chris Lemaire's avatar Chris Lemaire
Browse files

Merge branch 'migrationHotFix' into 'development'

Production hotfixes

See merge request !295
parents d34fa6c0 bdb8c0f1
No related branches found
No related tags found
3 merge requests!364Release to master,!360Release 1.2.0,!295Production hotfixes
...@@ -68,7 +68,7 @@ public class RequestCreateModel { ...@@ -68,7 +68,7 @@ public class RequestCreateModel {
r.setQuestion(question); r.setQuestion(question);
r.setLab(lab); r.setLab(lab);
r.setAssignment(assignment); r.setAssignment(assignment);
if (jitsi) { if (jitsi != null && jitsi) {
r.setJitsiRoom(); r.setJitsiRoom();
} }
return r; return r;
......
...@@ -171,13 +171,14 @@ databaseChangeLog: ...@@ -171,13 +171,14 @@ databaseChangeLog:
- renameColumn: - renameColumn:
newColumnName: enqueue_closed newColumnName: enqueue_closed
oldColumnName: exam_closed oldColumnName: exam_closed
columnDataType: bool
tableName: lab tableName: lab
- changeSet: - changeSet:
- id: 7-1 - id: 7-1
- author: "Cedric Willekens" - author: "Cedric Willekens"
- changes: - changes:
- addColumn: - addColumn:
tableName: NOTIFICATION tableName: notification
columns: columns:
- column: - column:
name: url name: url
...@@ -190,10 +191,10 @@ databaseChangeLog: ...@@ -190,10 +191,10 @@ databaseChangeLog:
tableName: lab tableName: lab
oldColumnName: direction oldColumnName: direction
newColumnName: communication_method newColumnName: communication_method
columnDataType: VARCHAR columnDataType: VARCHAR(255)
- addColumn: - addColumn:
tableName: request tableName: request
columns: columns:
- column: - column:
name: jitsi_room name: jitsi_room
type: VARCHAR type: VARCHAR(255)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment