Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Chronos
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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Serhii Horichenko
AlekSIS-App-Chronos
Commits
6e733cf6
Verified
Commit
6e733cf6
authored
3 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into feature/support-date-for-period-time-start-end
parents
04b1a0fa
dc8f32f2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.rst
+5
-0
5 additions, 0 deletions
CHANGELOG.rst
aleksis/apps/chronos/models.py
+1
-1
1 addition, 1 deletion
aleksis/apps/chronos/models.py
poetry.lock
+456
-393
456 additions, 393 deletions
poetry.lock
with
462 additions
and
394 deletions
CHANGELOG.rst
+
5
−
0
View file @
6e733cf6
...
...
@@ -14,6 +14,11 @@ Changed
* Support dates for ``TimePeriod.get_datetime_start`` and ``TimePeriod.get_datetime_end``.
Fixed
~~~~~
* ``Event.__str__`` returned a proxy type instead a string.
`2.0rc2`_ - 2021-08-01
----------
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/chronos/models.py
+
1
−
1
View file @
6e733cf6
...
...
@@ -986,7 +986,7 @@ class Event(SchoolTermRelatedExtensibleModel, GroupPropertiesMixin, TeacherPrope
if
self
.
title
:
return
self
.
title
else
:
return
_
(
f
"
Event
{
self
.
pk
}
"
)
return
_
(
"
Event {
pk}
"
).
format
(
pk
=
self
.
pk
)
@property
def
raw_period_from_on_day
(
self
)
->
TimePeriod
:
...
...
This diff is collapsed.
Click to expand it.
poetry.lock
+
456
−
393
View file @
6e733cf6
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