Resolve "Add rules and permissions" (!49) · Merge requests · AlekSIS® / Official / AlekSIS-App-Alsijil

Merged Jonathan Weth requested to merge 73-add-rules-and-permissions into master 4 years ago

Oct 24, 2020
- Fix defaults of some predicates (True to False) and catch side effect of this change · 47ab315d
  Jonathan Weth authored 4 years ago
  
  Verified
  
  47ab315d
- Rename get_instance_by_pk and document it better · 31fed539
  Jonathan Weth authored 4 years ago
  
  Verified
  
  31fed539
- Make permission checks in views.py additive · 3d5d957c
  Jonathan Weth authored 4 years ago
  
  Verified
  
  3d5d957c
- Add some extra commenting in forms.py · 5b288ced
  Jonathan Weth authored 4 years ago
  
  Verified
  
  5b288ced
- Simplify request getter in forms · d1f104f9
  Jonathan Weth authored 4 years ago
  
  Verified
  
  d1f104f9
- Remove debug prints · 0985aa3c
  Jonathan Weth authored 4 years ago
  
  Verified
  
  0985aa3c
Oct 23, 2020
- Refactor "and" sequence using all() · 9d6db523
  Jonathan Weth authored 4 years ago
  
  Verified
  
  9d6db523
Oct 21, 2020
- Include depending predicates in permission rules, · 57be44f2
  Jonathan Weth authored 4 years ago
  
  so that permissions are basing on other ones
  Verified
  
  57be44f2
- Make configurable if primary group owners can register absences for their groups · f57c83f3
  Jonathan Weth authored 4 years ago
  
  Verified
  
  f57c83f3
- Respect setting "view_own_personal_notes" on all places · fe5e0576
  Jonathan Weth authored 4 years ago
  
  Verified
  
  fe5e0576
Oct 15, 2020
- Merge branch 'fix/update-or-create' into 73-add-rules-and-permissions · 091caa94
  Jonathan Weth authored 4 years ago
  
  Verified
  
  091caa94
- Fix problems with update_or_create and prefetching · ee72ebc2
  Jonathan Weth authored 4 years ago
  
  Verified
  
  ee72ebc2
Sep 27, 2020
- Merge branch 'master' into 73-add-rules-and-permissions · ed1fede6
  Jonathan Weth authored 4 years ago
  
  Verified
  
  ed1fede6
Sep 11, 2020
- Add menu validator for "My groups" · 34ef43d1
  Jonathan Weth authored 4 years ago
  
  Verified
  
  34ef43d1
- Add permissions for "My groups" · cff25c97
  Jonathan Weth authored 4 years ago
  
  Verified
  
  cff25c97
- Merge branch 'master' into 73-add-rules-and-permissions · 120193ca
  Jonathan Weth authored 4 years ago
  
  Verified
  
  120193ca
Sep 07, 2020
- Simplify queryset in RegisterAbsenceForm · 45330d48
  Jonathan Weth authored 4 years ago
  
  Verified
  
  45330d48
- Merge branch 'master' into 73-add-rules-and-permissions · e9282bc9
  Jonathan Weth authored 4 years ago
  
  Verified
  
  e9282bc9
Aug 30, 2020
- Reformat · e4189166
  Jonathan Weth authored 4 years ago
  
  Verified
  
  e4189166
- [Person overview] Show delete button also when personal note is excused · e37a73ca
  Jonathan Weth authored 4 years ago
  
  Verified
  
  e37a73ca
- Add permissions check for DeletePersonalNoteView · 8262a4aa
  Jonathan Weth authored 4 years ago
  
  Verified
  
  8262a4aa
- Merge branch 'master' into 73-add-rules-and-permissions · d2caa75c
  Jonathan Weth authored 4 years ago
  
  Verified
  
  d2caa75c
Aug 23, 2020
- Reformat · 256bf855
  Jonathan Weth authored 4 years ago
  
  Verified
  
  256bf855
- Fix permissions and permission checks for person overview · 2c4e8922
  Jonathan Weth authored 4 years ago
  
  Verified
  
  2c4e8922
Aug 21, 2020
- Fix register_absence rules (allow only primary group owners to register absences) · 0319cbcf
  Jonathan Weth authored 4 years ago
  
  Verified
  
  0319cbcf
- Merge branch 'master' into 73-add-rules-and-permissions · a5429af4
  Jonathan Weth authored 4 years ago
  
  Verified
  
  a5429af4
Aug 20, 2020
- Add permissions for students view and list · e3d26b7d
  Jonathan Weth authored 4 years ago
  
  Verified
  
  e3d26b7d
- Merge branch 'master' into 73-add-rules-and-permissions · f3206ef4
  Jonathan Weth authored 4 years ago
  
  Verified
  
  f3206ef4
- Fix call of property · df357a62
  Jonathan Weth authored 4 years ago
  
  Verified
  
  df357a62
- Fix is_personal_note_lesson_teacher · ef75d02b
  Jonathan Weth authored 4 years ago
  
  Verified
  
  ef75d02b
- Fix view_week_personalnote · 32ad8b40
  Jonathan Weth authored 4 years ago
  
  Verified
  
  32ad8b40
- Add missing load for template tags · 5a900697
  Jonathan Weth authored 4 years ago
  
  Verified
  
  5a900697
- Check permission of lesson documentations in week view · 0a2acd87
  Jonathan Weth authored 4 years ago
  
  Verified
  
  0a2acd87
- Simplify queryset in SelectForm · d2331821
  Jonathan Weth authored 4 years ago
  
  Verified
  
  d2331821
- Fix request getter in SelectForm · 0cab5ee3
  Jonathan Weth authored 4 years ago
  
  Verified
  
  0cab5ee3
- Fix form query method · fce909de
  Jonathan Weth authored 4 years ago
  
  Verified
  
  fce909de
- Fix queryset · ff67a50a
  Jonathan Weth authored 4 years ago
  
  Verified
  
  ff67a50a
- Fix querysets · e1aee095
  Jonathan Weth authored 4 years ago
  
  Verified
  
  e1aee095
- Fix querysets in select form · 66dd2f9c
  Jonathan Weth authored 4 years ago
  
  Verified
  
  66dd2f9c
Aug 19, 2020

Merge branch '79-filter-selects-on-week-overview-and-register-absence' into... · 0c1b499e

Hangzhi Yu authored 4 years ago

Merge branch '79-filter-selects-on-week-overview-and-register-absence' into '73-add-rules-and-permissions'

Resolve "Filter selects on week overview and register absence"

See merge request !72

0c1b499e

Merge branch '73-add-rules-and-permissions' into... · f3864ef9

Hangzhi Yu authored 4 years ago

Merge branch '73-add-rules-and-permissions' into '79-filter-selects-on-week-overview-and-register-absence'

# Conflicts:
#   aleksis/apps/alsijil/forms.py

f3864ef9

Aug 18, 2020
- Add several small bug fixes · cbd4e140
  Jonathan Weth authored 4 years ago
  
  Verified
  
  cbd4e140
- Reformat · f9ba7388
  Jonathan Weth authored 4 years ago
  
  Verified
  
  f9ba7388
- Merge branch 'master' into 73-add-rules-and-permissions · f6b135b2
  Jonathan Weth authored 4 years ago
  
  Verified
  
  f6b135b2
Aug 16, 2020
- Add filtered dropdowns for week overview · 017602dd
  Hangzhi Yu authored 4 years ago
  
  017602dd
- Filter person dropdown list of absence registration form with custom queryset... · 5b18cc4e
  Hangzhi Yu authored 4 years ago
  
  Filter person dropdown list of absence registration form with custom queryset instead of queryset_rules_filter
  5b18cc4e
- Merge branch '73-add-rules-and-permissions' into... · 16b2fb03
  Hangzhi Yu authored 4 years ago
  
  Merge branch '73-add-rules-and-permissions' into 79-filter-selects-on-week-overview-and-register-absence
  16b2fb03
- Fix is_lesson_teacher predicate · 46259cb0
  Hangzhi Yu authored 4 years ago and Hangzhi Yu committed 4 years ago
  
  46259cb0
- Do not all queries in has_any_object_absence, only necessary ones · 39496545
  Jonathan Weth authored 4 years ago
  
  Verified
  
  39496545
- Use correct permission in views · 25dc771a
  Jonathan Weth authored 4 years ago
  
  Verified
  
  25dc771a
- Fix query · b422dae3
  Jonathan Weth authored 4 years ago
  
  Verified
  
  b422dae3
- Merge branch 'master' into 73-add-rules-and-permissions · fc2f0f6c
  Jonathan Weth authored 4 years ago
  
  Verified
  
  fc2f0f6c
Aug 14, 2020
- Remove usage of has_any_object and change to custom queries · f2151ca2
  Hangzhi Yu authored 4 years ago
  
  f2151ca2
Aug 10, 2020
- Change edit personal note rule · bd4c962a
  Hangzhi Yu authored 4 years ago
  
  bd4c962a
- add menu validator for extra marks · fe5d0416
  Hangzhi Yu authored 4 years ago
  
  fe5d0416
- Change rule name · 3daf91e8
  Hangzhi Yu authored 4 years ago
  
  3daf91e8
- Allow filtering of personal notes displayed in overview of last lesson and... · 4964c534
  Hangzhi Yu authored 4 years ago
  
  Allow filtering of personal notes displayed in overview of last lesson and improve personal notes rules
  4964c534
- Fixed typo in extramark rule · 9a6d823e
  Hangzhi Yu authored 4 years ago
  
  9a6d823e
Aug 06, 2020
- Fixed mixin sequency in class-based views · 867088d7
  Hangzhi Yu authored 4 years ago
  
  867088d7
- Add permissions for management of extra marks · 8f136405
  Hangzhi Yu authored 4 years ago
  
  8f136405
- Revert "Fix rules" · 4ce2f988
  Hangzhi Yu authored 4 years ago
  
  This reverts commit 6da0a1a0
  4ce2f988
Aug 05, 2020
- Merge branch 'master' into 73-add-rules-and-permissions · e8144bc6
  Jonathan Weth authored 4 years ago
  
  Verified
  
  e8144bc6
Aug 04, 2020
- Fix is_lesson_teacher: Wrong qs · 910e001c
  Jonathan Weth authored 4 years ago
  
  Verified
  
  910e001c
- Fix wrong used pk · 87e90a54
  Jonathan Weth authored 4 years ago
  
  Verified
  
  87e90a54
Aug 03, 2020
- Fix rules · 6da0a1a0
  Jonathan Weth authored 4 years ago
  
  Verified
  
  6da0a1a0
- Merge branch 'master' into 73-add-rules-and-permissions · 4daa50e1
  Jonathan Weth authored 4 years ago
  
  Verified
  
  4daa50e1
- Fix permissions in lesson.html after merge · f1a5702d
  Jonathan Weth authored 4 years ago
  
  Verified
  
  f1a5702d
- Reformat · 780fd921
  Jonathan Weth authored 4 years ago
  
  Verified
  
  780fd921
- Remove rests of personal note filters · 7652c383
  Jonathan Weth authored 4 years ago
  
  Verified
  
  7652c383
- Merge branch 'master' into 73-add-rules-and-permissions · 5143e011
  Jonathan Weth authored 4 years ago
  
  # Conflicts: # aleksis/apps/alsijil/menus.py # aleksis/apps/alsijil/models.py # aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html # aleksis/apps/alsijil/views.py
  Verified
  
  5143e011
Jul 22, 2020
- Also check whether a person is a teacher in a LessonSubstitution in is_lesson_teacher · 63c96016
  Hangzhi Yu authored 4 years ago
  
  63c96016
- Add rules&permissions for excuse types · 62c3ea5d
  Hangzhi Yu authored 4 years ago
  
  62c3ea5d
Jul 20, 2020

Merge branch 'master' into 73-add-rules-and-permissions · 9cff3804

Hangzhi Yu authored 4 years ago

# Conflicts:
#	aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
#	aleksis/apps/alsijil/views.py

9cff3804

Jul 17, 2020
- Filter possible selection in absence form · 0d6400b4
  Hangzhi Yu authored 4 years ago
  
  0d6400b4
- Reformat predicates · 0292d973
  Hangzhi Yu authored 4 years ago
  
  0292d973
- Fix is_person_group_owner predicate · 7365b60b
  Hangzhi Yu authored 4 years ago
  
  7365b60b
- Refactor predicates · 5eb56aae
  Hangzhi Yu authored 4 years ago
  
  5eb56aae
- Rename personalnotefilter rules · d524ad07
  Hangzhi Yu authored 4 years ago
  
  d524ad07
- Add menu validators using rules · 6e9a0f60
  Hangzhi Yu authored 4 years ago
  
  6e9a0f60
Jul 02, 2020
- Merge branch 'master' into 73-add-rules-and-permissions · 07ca4f09
  Jonathan Weth authored 4 years ago
  
  Verified
  
  07ca4f09
Jun 27, 2020
- Fix usage of RelatedQuerySet in predicate · 26b63e39
  Jonathan Weth authored 4 years ago
  
  Verified
  
  26b63e39
- Annotate week in get_lesson_by_period_pk · b7fa224e
  Jonathan Weth authored 4 years ago
  
  Verified
  
  b7fa224e
- Merge branch '73-add-rules-and-permissions' of... · 262cf49e
  Jonathan Weth authored 4 years ago
  
  Merge branch '73-add-rules-and-permissions' of edugit.org:AlekSIS/official/AlekSIS-App-Alsijil into 73-add-rules-and-permissions
  Verified
  
  262cf49e
- Merge branch '73-add-rules-and-permissions' of... · 52c06bb4
  Jonathan Weth authored 4 years ago
  
  Merge branch '73-add-rules-and-permissions' of edugit.org:AlekSIS/official/AlekSIS-App-Alsijil into 73-add-rules-and-permissions
  Verified
  
  52c06bb4
- Merge branch '73-add-rules-and-permissions' of... · b3df531e
  Jonathan Weth authored 4 years ago
  
  Merge branch '73-add-rules-and-permissions' of edugit.org:AlekSIS/official/AlekSIS-App-Alsijil into 73-add-rules-and-permissions
  Verified
  
  b3df531e
- Merge branch 'master' into 73-add-rules-and-permissions · 4cf0c8e6
  Jonathan Weth authored 4 years ago
  
  Verified
  
  4cf0c8e6
Jun 21, 2020
- Fixed permission for absence register · b1978f7a
  Hangzhi Yu authored 4 years ago
  
  b1978f7a
Jun 20, 2020
- Convert pks of lesson periods to list to simplify query · f3cc545c
  Jonathan Weth authored 4 years ago
  
  Reason: A too complex query can cause database problems.
  Verified
  
  f3cc545c
Jun 19, 2020
- Fix permission names and core/alsijil relation · fbbb6020
  Jonathan Weth authored 4 years ago
  
  Verified
  
  fbbb6020
Jun 18, 2020
- Move annotate before union because annotating works only before union · 93203b44
  Jonathan Weth authored 4 years ago
  
  Verified
  
  93203b44
- Fix lint issues and reformat files · 6b0eedfd
  Jonathan Weth authored 4 years ago
  
  Verified
  
  6b0eedfd
- Merge branch 'master' into 73-add-rules-and-permissions · 95f16ef8
  Jonathan Weth authored 4 years ago
  
  Verified
  
  95f16ef8
- Fix order of queries in week view · c8791096
  Jonathan Weth authored 4 years ago
  
  Week has to be annotated before querying teachers
  Verified
  
  c8791096
- Merge branch 'master' into 73-add-rules-and-permissions · 442e28eb
  Jonathan Weth authored 4 years ago
  
  Verified
  
  442e28eb
- Merge branch '73-add-rules-and-permissions' of... · 287cac5e
  Jonathan Weth authored 4 years ago
  
  Merge branch '73-add-rules-and-permissions' of edugit.org:AlekSIS/official/AlekSIS-App-Alsijil into 73-add-rules-and-permissions
  Verified
  
  287cac5e
Jun 17, 2020
- Fix typo · 53bfe409
  Hangzhi Yu authored 4 years ago
  
  53bfe409
- Add tooltips in alsijil_helpers.py · 2011793a
  Hangzhi Yu authored 4 years ago
  
  2011793a
- Replace ugettext with gettext · a95d775a
  Hangzhi Yu authored 4 years ago
  
  a95d775a
- Add rules&permissions in class register template · 420f07a0
  Hangzhi Yu authored 4 years ago
  
  420f07a0
- Fix order of has_perm and perm check in lesson template · 2a84050c
  Jonathan Weth authored 4 years ago
  
  Verified
  
  2a84050c

Resolve "Add rules and permissions"

Merge request reports

Activity