Skip to content
Snippets Groups Projects

Resolve "Add rules and permissions"

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

Closes #73 (closed)

Closes #79 (closed)

Edited by Nik | Klampfradler

Merge request reports

Pipeline #4072 failed

Pipeline failed for 47ab315d on 73-add-rules-and-permissions

Approval is optional

Merged by Nik | KlampfradlerNik | Klampfradler 4 years ago (Oct 24, 2020 9:39pm UTC)

Merge details

Pipeline #4074 failed

Pipeline failed for 50db5254 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Jonathan Weth
  • I think the persons someone can select to register an absence should be filtered according to one's permissions. @yuha

  • assigned to @nik

  • @nik Please review as soon as it's possible for you – that would be very nice. (Despite it's still WIP.)

  • Nik | Klampfradler
  • Nik | Klampfradler
  • Nik | Klampfradler
  • Jonathan Weth added 34 commits

    added 34 commits

    Compare with previous version

  • Jonathan Weth added 1 commit

    added 1 commit

    • c0e47390 - Merge branch 'master' into 73-add-rules-and-permissions

    Compare with previous version

  • Jonathan Weth added 2 commits

    added 2 commits

    • a85bcae6 - Merge branch 'master' into 73-add-rules-and-permissions
    • 451cdb33 - Merge branch '73-add-rules-and-permissions' of...

    Compare with previous version

  • Jonathan Weth added 1 commit

    added 1 commit

    • 2a84050c - Fix order of has_perm and perm check in lesson template

    Compare with previous version

  • Hangzhi Yu added 1 commit

    added 1 commit

    • 45de9a0c - Merge branch 'master' into 73-add-rules-and-permissions

    Compare with previous version

  • Hangzhi Yu added 2 commits

    added 2 commits

    • 420f07a0 - Add rules&permissions in class register template
    • a95d775a - Replace ugettext with gettext

    Compare with previous version

  • Hangzhi Yu added 1 commit

    added 1 commit

    • 2011793a - Add tooltips in alsijil_helpers.py

    Compare with previous version

  • Hangzhi Yu added 1 commit

    added 1 commit

    Compare with previous version

  • Hangzhi Yu resolved all threads

    resolved all threads

  • Jonathan Weth added 5 commits

    added 5 commits

    • 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
    • 287cac5e - Merge branch '73-add-rules-and-permissions' of...

    Compare with previous version

  • Jonathan Weth added 2 commits

    added 2 commits

    • c940fbce - 1 commit from branch master
    • 442e28eb - Merge branch 'master' into 73-add-rules-and-permissions

    Compare with previous version

  • Jonathan Weth added 1 commit

    added 1 commit

    • c8791096 - Fix order of queries in week view

    Compare with previous version

  • Jonathan Weth added 9 commits

    added 9 commits

    Compare with previous version

  • Jonathan Weth added 1 commit

    added 1 commit

    • 93203b44 - Move annotate before union because annotating works only before union

    Compare with previous version

  • Jonathan Weth added 1 commit

    added 1 commit

    • fbbb6020 - Fix permission names and core/alsijil relation

    Compare with previous version

  • Jonathan Weth added 1 commit

    added 1 commit

    • f3cc545c - Convert pks of lesson periods to list to simplify query

    Compare with previous version

  • Hangzhi Yu added 1 commit

    added 1 commit

    • b1978f7a - Fixed permission for absence register

    Compare with previous version

  • Jonathan Weth added 10 commits

    added 10 commits

    • b1978f7a...607ae327 - 8 commits from branch master
    • 4cf0c8e6 - Merge branch 'master' into 73-add-rules-and-permissions
    • b3df531e - Merge branch '73-add-rules-and-permissions' of...

    Compare with previous version

  • Jonathan Weth added 2 commits

    added 2 commits

    • 52c06bb4 - Merge branch '73-add-rules-and-permissions' of...
    • 262cf49e - Merge branch '73-add-rules-and-permissions' of...

    Compare with previous version

  • Jonathan Weth added 1 commit

    added 1 commit

    • b7fa224e - Annotate week in get_lesson_by_period_pk

    Compare with previous version

  • Jonathan Weth added 1 commit

    added 1 commit

    • 26b63e39 - Fix usage of RelatedQuerySet in predicate

    Compare with previous version

  • Jonathan Weth added 3 commits

    added 3 commits

    Compare with previous version

  • mentioned in issue #81 (closed)

  • Hangzhi Yu added 5 commits

    added 5 commits

    Compare with previous version

  • Hangzhi Yu added 2 commits

    added 2 commits

    • 46e73bc3 - Remove unnecessary global permissions
    • 3d8f9797 - Remove unnecessary global permission from rules

    Compare with previous version

  • Jonathan Weth
  • @yuha I don't know if I already had written or said it, but please also pay attention to substitutions (substitution teachers can access a lesson as well as regular teachers etc.)

  • Hangzhi Yu added 34 commits

    added 34 commits

    Compare with previous version

  • Hangzhi Yu added 1 commit

    added 1 commit

    • 63c96016 - Also check whether a person is a teacher in a LessonSubstitution in is_lesson_teacher

    Compare with previous version

  • "Add permissions for management of excuse types" done

  • As !68 (merged) is merged, it would be great if you could do the tasks in the comment above.

  • Jonathan Weth added 48 commits

    added 48 commits

    Compare with previous version

  • Jonathan Weth added 1 commit

    added 1 commit

    • f1a5702d - Fix permissions in lesson.html after merge

    Compare with previous version

  • Jonathan Weth added 2 commits

    added 2 commits

    • 49392296 - 1 commit from branch master
    • 4daa50e1 - Merge branch 'master' into 73-add-rules-and-permissions

    Compare with previous version

  • Jonathan Weth added 1 commit

    added 1 commit

    Compare with previous version

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading