Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Odevzdávací Systém MO
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Martin Mareš
Odevzdávací Systém MO
Compare revisions
b9bd99e6227943cbb91708f7a2d5f4a8fb568162 to c52c69b925d3cb7aa016e4bd92e7c0758668016d
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
mj/mo-submit
Select target project
No results found
c52c69b925d3cb7aa016e4bd92e7c0758668016d
Select Git revision
Branches
devel
fo
fo-base
honza/add-contestant
honza/kolo-vs-soutez
honza/mr6
honza/mr7
honza/mra
honza/mrd
honza/mrf
honza/submit-images
jh-stress-test-wip
jirka/typing
jk/issue-196
jk/issue-96
master
mj/submit-images
shorten-schools
18 results
Swap
Target
mj/mo-submit
Select target project
mj/mo-submit
1 result
b9bd99e6227943cbb91708f7a2d5f4a8fb568162
Select Git revision
Branches
devel
fo
fo-base
honza/add-contestant
honza/kolo-vs-soutez
honza/mr6
honza/mr7
honza/mra
honza/mrd
honza/mrf
honza/submit-images
jh-stress-test-wip
jirka/typing
jk/issue-196
jk/issue-96
master
mj/submit-images
shorten-schools
18 results
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (2)
Better error messages with preserved line ends
· 0bf64f7d
Jan Prachař
authored
4 years ago
0bf64f7d
Merge branch 'honza/pre' into 'master'
· c52c69b9
Martin Mareš
authored
4 years ago
Better error messages with preserved line ends See merge request
!40
c52c69b9
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
mo/web/templates/org_generic_batch_points.html
+2
-2
2 additions, 2 deletions
mo/web/templates/org_generic_batch_points.html
mo/web/templates/org_job.html
+2
-2
2 additions, 2 deletions
mo/web/templates/org_job.html
with
4 additions
and
4 deletions
mo/web/templates/org_generic_batch_points.html
View file @
c52c69b9
...
...
@@ -11,11 +11,11 @@
{% if errs %}
<h3>
Chyby při importu
</h3>
<pre>
<div
class=
"alert alert-danger"
role=
"alert"
>
{{ "" -}}
<div
class=
"alert alert-danger"
role=
"alert"
style=
"white-space: pre-line"
>
{{ "" -}}
{% for e in errs %}
{{ e }}
{% endfor %}
</div>
</pre>
</div>
{% endif %}
<p>
Zde si můžete stáhnout bodovací formulář v zadaném formátu a pak ho nahrát zpět
...
...
This diff is collapsed.
Click to expand it.
mo/web/templates/org_job.html
View file @
c52c69b9
...
...
@@ -24,11 +24,11 @@
{% if has_errors %}
<h3>
Chyby
</h3>
<pre>
<div
class=
"alert alert-danger"
role=
"alert"
>
{{ "" -}}
<div
class=
"alert alert-danger"
role=
"alert"
style=
"white-space: pre-line"
>
{{ "" -}}
{% for e in job.out_json['errors'] %}
{{ e }}
{% endfor %}
</div>
</pre>
</div>
{% endif %}
...
...
This diff is collapsed.
Click to expand it.