Resolve "Filter selects on week overview and register absence"
Merged
requested to merge 79-filter-selects-on-week-overview-and-register-absence into 73-add-rules-and-permissions
Closes #79 (closed)
Edited by Hangzhi Yu
Merge request reports
Activity
changed milestone to %1.0a1
added workflow::blocked label
Blocked by #73 (closed)
added 143 commits
-
0d6400b4...19ac25fc - 82 commits from branch
master
- 6e338635 - Add rules and permissions for some views
- e65b4cb2 - Add some more rules&permissions
- 45de9a0c - Merge branch 'master' into 73-add-rules-and-permissions
- a85bcae6 - Merge branch 'master' into 73-add-rules-and-permissions
- c0e47390 - Merge branch 'master' into 73-add-rules-and-permissions
- 451cdb33 - Merge branch '73-add-rules-and-permissions' of...
- 2a84050c - Fix order of has_perm and perm check in lesson template
- 420f07a0 - Add rules&permissions in class register template
- a95d775a - Replace ugettext with gettext
- 2011793a - Add tooltips in alsijil_helpers.py
- 53bfe409 - Fix typo
- 287cac5e - Merge branch '73-add-rules-and-permissions' of...
- 442e28eb - Merge branch 'master' into 73-add-rules-and-permissions
- c8791096 - Fix order of queries in week view
- 95f16ef8 - Merge branch 'master' into 73-add-rules-and-permissions
- 6b0eedfd - Fix lint issues and reformat files
- 93203b44 - Move annotate before union because annotating works only before union
- fbbb6020 - Fix permission names and core/alsijil relation
- f3cc545c - Convert pks of lesson periods to list to simplify query
- b1978f7a - Fixed permission for absence register
- 4cf0c8e6 - Merge branch 'master' into 73-add-rules-and-permissions
- b3df531e - Merge branch '73-add-rules-and-permissions' of...
- 52c06bb4 - Merge branch '73-add-rules-and-permissions' of...
- 262cf49e - Merge branch '73-add-rules-and-permissions' of...
- b7fa224e - Annotate week in get_lesson_by_period_pk
- 26b63e39 - Fix usage of RelatedQuerySet in predicate
- 07ca4f09 - Merge branch 'master' into 73-add-rules-and-permissions
- 6e9a0f60 - Add menu validators using rules
- d524ad07 - Rename personalnotefilter rules
- 5eb56aae - Refactor predicates
- 7365b60b - Fix is_person_group_owner predicate
- 0292d973 - Reformat predicates
- 9cff3804 - Merge branch 'master' into 73-add-rules-and-permissions
- 62c3ea5d - Add rules&permissions for excuse types
- 63c96016 - Also check whether a person is a teacher in a LessonSubstitution in is_lesson_teacher
- 5143e011 - Merge branch 'master' into 73-add-rules-and-permissions
- 7652c383 - Remove rests of personal note filters
- 780fd921 - Reformat
- f1a5702d - Fix permissions in lesson.html after merge
- 4daa50e1 - Merge branch 'master' into 73-add-rules-and-permissions
- 6da0a1a0 - Fix rules
- 87e90a54 - Fix wrong used pk
- 910e001c - Fix is_lesson_teacher: Wrong qs
- e8144bc6 - Merge branch 'master' into 73-add-rules-and-permissions
- 4ce2f988 - Revert "Fix rules"
- 8f136405 - Add permissions for management of extra marks
- 867088d7 - Fixed mixin sequency in class-based views
- 9a6d823e - Fixed typo in extramark rule
- 4964c534 - Allow filtering of personal notes displayed in overview of last lesson and...
- 3daf91e8 - Change rule name
- fe5d0416 - add menu validator for extra marks
- bd4c962a - Change edit personal note rule
- f2151ca2 - Remove usage of has_any_object and change to custom queries
- fc2f0f6c - Merge branch 'master' into 73-add-rules-and-permissions
- b422dae3 - Fix query
- 25dc771a - Use correct permission in views
- 39496545 - Do not all queries in has_any_object_absence, only necessary ones
- 46259cb0 - Fix is_lesson_teacher predicate
- 16b2fb03 - Merge branch '73-add-rules-and-permissions' into...
- 5b18cc4e - Filter person dropdown list of absence registration form with custom queryset...
- 017602dd - Add filtered dropdowns for week overview
Toggle commit list-
0d6400b4...19ac25fc - 82 commits from branch
added 143 commits
-
0d6400b4...46259cb0 - 140 commits from branch
73-add-rules-and-permissions
- 16b2fb03 - Merge branch '73-add-rules-and-permissions' into...
- 5b18cc4e - Filter person dropdown list of absence registration form with custom queryset...
- 017602dd - Add filtered dropdowns for week overview
Toggle commit list-
0d6400b4...46259cb0 - 140 commits from branch
added 6 commits
-
017602dd...cbd4e140 - 5 commits from branch
73-add-rules-and-permissions
- f3864ef9 - Merge branch '73-add-rules-and-permissions' into...
-
017602dd...cbd4e140 - 5 commits from branch
mentioned in commit 0c1b499e
Please register or sign in to reply