Skip to content
Snippets Groups Projects
Commit 175e97fc authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'prepare-release-2.0rc2' into 'release/2.0'

Prepare release 2.0rc2

See merge request !194
parents 053fedbd 6dc9e7d1
No related branches found
No related tags found
1 merge request!194Prepare release 2.0rc2
Pipeline #24919 passed with warnings
...@@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file. ...@@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file.
The format is based on `Keep a Changelog`_, The format is based on `Keep a Changelog`_,
and this project adheres to `Semantic Versioning`_. and this project adheres to `Semantic Versioning`_.
`2.0rc2`_ - 2021-08-01
----------
Fixed
~~~~~
* Drop usage of non-existing permission in permission rules for lesson substitutions.
`2.0rc1`_ - 2021-06-23 `2.0rc1`_ - 2021-06-23
---------------------- ----------------------
...@@ -187,3 +195,4 @@ Fixed ...@@ -187,3 +195,4 @@ Fixed
.. _2.0b2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b2 .. _2.0b2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b2
.. _2.0b3: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b3 .. _2.0b3: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b3
.. _2.0rc1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0rc1 .. _2.0rc1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0rc1
.. _2.0rc2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0rc2
...@@ -44,7 +44,7 @@ add_perm("chronos.delete_substitution_rule", delete_substitution_predicate) ...@@ -44,7 +44,7 @@ add_perm("chronos.delete_substitution_rule", delete_substitution_predicate)
# View substitutions # View substitutions
view_substitutions_predicate = has_person & ( view_substitutions_predicate = has_person & (
has_global_perm("chronos.view_lessonsubstitution") has_global_perm("chronos.view_lessonsubstitution")
| has_any_object("chronos.view_lessonsubstitution_rule", LessonSubstitution) | has_any_object("chronos.view_lessonsubstitution", LessonSubstitution)
) )
add_perm("chronos.view_substitutions_rule", view_substitutions_predicate) add_perm("chronos.view_substitutions_rule", view_substitutions_predicate)
......
This diff is collapsed.
[tool.poetry] [tool.poetry]
name = "AlekSIS-App-Chronos" name = "AlekSIS-App-Chronos"
version = "2.0rc1" version = "2.0rc2"
packages = [ packages = [
{ include = "aleksis" } { include = "aleksis" }
] ]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment