Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Untis
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-Untis
Commits
97ca02d4
Verified
Commit
97ca02d4
authored
4 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Update template for XML import
parent
a0785efc
No related branches found
No related tags found
1 merge request
!13
Resolve "Support import from MySQL"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
aleksis/apps/untis/menus.py
+2
-2
2 additions, 2 deletions
aleksis/apps/untis/menus.py
aleksis/apps/untis/templates/untis/xml_import.html
+4
-4
4 additions, 4 deletions
aleksis/apps/untis/templates/untis/xml_import.html
aleksis/apps/untis/views.py
+1
-1
1 addition, 1 deletion
aleksis/apps/untis/views.py
with
7 additions
and
7 deletions
aleksis/apps/untis/menus.py
+
2
−
2
View file @
97ca02d4
...
...
@@ -3,8 +3,8 @@ from django.utils.translation import ugettext_lazy as _
MENUS
=
{
"
DATA_MANAGEMENT_MENU
"
:
[
{
"
name
"
:
_
(
"
Untis import
"
),
"
url
"
:
"
untis_import
"
,
"
name
"
:
_
(
"
Untis
XML
import
"
),
"
url
"
:
"
untis_
xml_
import
"
,
"
validators
"
:
[
"
menu_generator.validators.is_authenticated
"
,
"
menu_generator.validators.is_superuser
"
,
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/untis/templates/untis/
untis
_import.html
→
aleksis/apps/untis/templates/untis/
xml
_import.html
+
4
−
4
View file @
97ca02d4
...
...
@@ -5,7 +5,7 @@
{% load material_form i18n %}
{% block page_title %}{% blocktrans %}Import Untis data{% endblocktrans %}{% endblock %}
{% block page_title %}{% blocktrans %}Import Untis data
via XML
{% endblocktrans %}{% endblock %}
{% block content %}
...
...
@@ -14,9 +14,9 @@
Untis provides a function for exporting all data as an XML file.
{% endblocktrans %}
</p>
<div
class=
"alert
error
"
>
<div
class=
"alert
warning
"
>
<p>
<i
class=
"material-icons left"
>
error
</i>
<i
class=
"material-icons left"
>
warning
</i>
{% blocktrans %}
Newly imported data will be valid as of tomorrow.
{% endblocktrans %}
...
...
@@ -37,7 +37,7 @@
<form
method=
"post"
enctype=
"multipart/form-data"
>
{% csrf_token %}
{% form form=upload_form %}{% endform %}
{% include "core/save_button.html" %}
{% include "core/save_button.html"
with icon="import_export" caption=_("Import data")
%}
</form>
{% endblock %}
This diff is collapsed.
Click to expand it.
aleksis/apps/untis/views.py
+
1
−
1
View file @
97ca02d4
...
...
@@ -24,7 +24,7 @@ def xml_import(request: HttpRequest) -> HttpResponse:
context
[
"
upload_form
"
]
=
upload_form
return
render
(
request
,
"
untis/
untis
_import.html
"
,
context
)
return
render
(
request
,
"
untis/
xml
_import.html
"
,
context
)
@login_required
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment