Commit bd786b7e authored by Ryan Herbert's avatar Ryan Herbert

Merge branch 'dev' of gitlab.inria.fr:vidjil/vidjil into dev

parents 514f0fe7 4b15b9c8
Pipeline #20004 failed with stages
in 44 seconds
......@@ -2177,7 +2177,11 @@ form .form_label {
border-radius: unset;
box-shadow: unset;
cursor: pointer;
width: 234px;
width: 300px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
height: 30px;
}
.form-control.date {
min-width: 85px;
......
......@@ -2177,7 +2177,11 @@ form .form_label {
border-radius: unset;
box-shadow: unset;
cursor: pointer;
width: 234px;
width: 300px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
height: 30px;
}
.form-control.date {
min-width: 85px;
......
......@@ -2177,7 +2177,11 @@ form .form_label {
border-radius: unset;
box-shadow: unset;
cursor: pointer;
width: 234px;
width: 300px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
height: 30px;
}
.form-control.date {
min-width: 85px;
......
......@@ -2176,7 +2176,11 @@ form .form_label {
border-radius: unset;
box-shadow: unset;
cursor: pointer;
width: 234px;
width: 300px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
height: 30px;
}
.form-control.date {
min-width: 85px;
......
......@@ -2177,7 +2177,11 @@ form .form_label {
border-radius: unset;
box-shadow: unset;
cursor: pointer;
width: 234px;
width: 300px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
height: 30px;
}
.form-control.date {
min-width: 85px;
......
......@@ -2495,7 +2495,9 @@ form {
border-radius: unset;
box-shadow: unset;
cursor: pointer;
width: 234px;
width: 300px;
.ellipsis;
height: 30px;
}
&.date {
......
......@@ -202,7 +202,8 @@ def submit():
pre_process = None
pre_process_flag = "DONE"
if data['pre_process'] is not None and int(data['pre_process']) > 0:
if 'pre_process' in data and data['pre_process'] is not None and\
int(data['pre_process']) > 0:
pre_process = int(data['pre_process'])
pre_process_flag = "WAIT"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment