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
bbb48f7c
Verified
Commit
bbb48f7c
authored
3 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Skip extra lessons without a subject
(cherry picked from commit
e4060943
)
parent
a4a3e35e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!88
Prepare release 2.0rc3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.rst
+13
-0
13 additions, 0 deletions
CHANGELOG.rst
aleksis/apps/untis/util/mysql/importers/substitutions.py
+4
-0
4 additions, 0 deletions
aleksis/apps/untis/util/mysql/importers/substitutions.py
with
17 additions
and
0 deletions
CHANGELOG.rst
+
13
−
0
View file @
bbb48f7c
...
...
@@ -6,6 +6,19 @@ All notable changes to this project will be documented in this file.
The format is based on `Keep a Changelog`_,
and this project adheres to `Semantic Versioning`_.
Unreleased
----------
Changed
~~~~~~~
* Wrap all imports in complete revisions to make it possible to undo them completely and to track changes correctly.
Fixed
~~~~~
* Skip extra lessons without a subject.
`2.0rc2`_ - 2021-07-30
----------------------
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/untis/util/mysql/importers/substitutions.py
+
4
−
0
View file @
bbb48f7c
...
...
@@ -180,6 +180,10 @@ def import_substitutions(
if
not
teacher_new
and
not
teacher_old
:
teachers
=
[]
if
not
subject
:
logger
.
warning
(
"
Skip because missing subject
"
)
continue
(
extra_lesson
,
created
,)
=
(
chronos_models
.
ExtraLesson
.
objects
.
select_related
(
None
)
.
prefetch_related
(
None
)
...
...
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