Resolve "Review permissions" #417

Merged
yuha merged 17 commits from 83-review-permissions into master 2021-05-16 12:47:54 +02:00
yuha commented 2020-12-21 21:50:03 +01:00 (Migrated from edugit.org)

Closes #83

Closes #83
yuha commented 2020-12-29 14:14:10 +01:00 (Migrated from edugit.org)

added 1 commit

  • c4b409e9 - Add additional rules&permissions in order to differentiate different access to...

Compare with previous version

added 1 commit <ul><li>c4b409e9 - Add additional rules&amp;permissions in order to differentiate different access to...</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=4113&start_sha=284b8d33f9e82ba53e7324f5cd4ebbd16e2666d2)
yuha commented 2021-01-22 20:57:26 +01:00 (Migrated from edugit.org)

added 1 commit

  • a9d65061 - Add view timetable permission for rooms

Compare with previous version

added 1 commit <ul><li>a9d65061 - Add view timetable permission for rooms</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=4441&start_sha=c4b409e985e05bf60a1093dad23ca58f31728f9a)
yuha commented 2021-01-25 17:00:35 +01:00 (Migrated from edugit.org)

added 1 commit

  • 67685b61 - Add additional rules&permissions in order to differentiate different access to...

Compare with previous version

added 1 commit <ul><li>67685b61 - Add additional rules&amp;permissions in order to differentiate different access to...</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=4519&start_sha=a9d65061787e8302633f69254f2355075ad9cfa4)
hansegucker commented 2021-03-05 21:12:03 +01:00 (Migrated from edugit.org)

assigned to @hansegucker

assigned to @hansegucker
hansegucker commented 2021-03-05 21:12:06 +01:00 (Migrated from edugit.org)

assigned to @nik and unassigned @hansegucker

assigned to @nik and unassigned @hansegucker
hansegucker commented 2021-03-05 21:12:09 +01:00 (Migrated from edugit.org)

requested review from @hansegucker

requested review from @hansegucker
hansegucker commented 2021-03-05 21:13:55 +01:00 (Migrated from edugit.org)

It might be more efficient I we exclude objects without permission already in the view (by filtering the queryset like we did it in Alsijil).

It might be more efficient I we exclude objects without permission already in the view (by filtering the queryset like we did it in Alsijil).
hansegucker commented 2021-03-05 21:16:20 +01:00 (Migrated from edugit.org)

It might be more efficient I we exclude objects without permission already in the view (by filtering the queryset like we did it in Alsijil).

It might be more efficient I we exclude objects without permission already in the view (by filtering the queryset like we did it in Alsijil).
hansegucker commented 2021-03-05 21:16:21 +01:00 (Migrated from edugit.org)

It might be more efficient I we exclude objects without permission already in the view (by filtering the queryset like we did it in Alsijil).

It might be more efficient I we exclude objects without permission already in the view (by filtering the queryset like we did it in Alsijil).
hansegucker commented 2021-03-05 21:16:21 +01:00 (Migrated from edugit.org)
            or obj in user.person.owner_of.all()
```suggestion:-0+0 or obj in user.person.owner_of.all() ```
hansegucker commented 2021-03-05 21:16:21 +01:00 (Migrated from edugit.org)
            obj in user.person.member_of.all()
```suggestion:-0+0 obj in user.person.member_of.all() ```
hansegucker commented 2021-03-05 21:17:53 +01:00 (Migrated from edugit.org)

@yuha At first glance, this already looks very fine. Can you please merge the current master into your branch and make the pipeline finishing successful? Please, check also whether this MR is still draft.

@yuha At first glance, this already looks very fine. Can you please merge the current master into your branch and make the pipeline finishing successful? Please, check also whether this MR is still draft.
yuha commented 2021-03-19 14:54:56 +01:00 (Migrated from edugit.org)

added 55 commits

  • 67685b61...cdbbd954 - 54 commits from branch master
  • 229f75f1 - Merge branch 'master' into 83-review-permissions

Compare with previous version

added 55 commits <ul><li>67685b61...cdbbd954 - 54 commits from branch <code>master</code></li><li>229f75f1 - Merge branch &#39;master&#39; into 83-review-permissions</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=5981&start_sha=67685b61fed30cd44ac31d0d9462fbed6278bf0a)
yuha commented 2021-03-19 15:06:21 +01:00 (Migrated from edugit.org)

added 1 commit

Compare with previous version

added 1 commit <ul><li>5270d4d2 - Fix order of imports</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=5984&start_sha=229f75f1782970a365d1db4ec93d3edfac9e30c0)
yuha commented 2021-03-19 16:00:07 +01:00 (Migrated from edugit.org)

changed this line in version 6 of the diff

changed this line in [version 6 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=5990&start_sha=5270d4d205c9cd49297aab4279b05ce1665e910f#17c677c6fda266376a52865c127bc25f98cf2314_16_16)
yuha commented 2021-03-19 16:00:08 +01:00 (Migrated from edugit.org)

added 1 commit

  • 87f5b9e3 - Apply 1 suggestion(s) to 1 file(s)

Compare with previous version

added 1 commit <ul><li>87f5b9e3 - Apply 1 suggestion(s) to 1 file(s)</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=5990&start_sha=5270d4d205c9cd49297aab4279b05ce1665e910f)
yuha commented 2021-03-19 16:02:01 +01:00 (Migrated from edugit.org)

changed this line in version 7 of the diff

changed this line in [version 7 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=5992&start_sha=87f5b9e3c9f35c5df8c97aeef51ec02dac602a7a#17c677c6fda266376a52865c127bc25f98cf2314_18_18)
yuha commented 2021-03-19 16:02:01 +01:00 (Migrated from edugit.org)

added 1 commit

  • 324305e8 - Apply 1 suggestion(s) to 1 file(s)

Compare with previous version

added 1 commit <ul><li>324305e8 - Apply 1 suggestion(s) to 1 file(s)</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=5992&start_sha=87f5b9e3c9f35c5df8c97aeef51ec02dac602a7a)
yuha commented 2021-03-19 16:14:41 +01:00 (Migrated from edugit.org)

changed this line in version 8 of the diff

changed this line in [version 8 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=5994&start_sha=324305e8aa1cce4becada70e7029e4453f2b0cdd#c8dd4cd30c79ae86053a5acb64d7bf496e827643_20_20)
yuha commented 2021-03-19 16:14:41 +01:00 (Migrated from edugit.org)

changed this line in version 8 of the diff

changed this line in [version 8 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=5994&start_sha=324305e8aa1cce4becada70e7029e4453f2b0cdd#c8dd4cd30c79ae86053a5acb64d7bf496e827643_34_31)
yuha commented 2021-03-19 16:14:41 +01:00 (Migrated from edugit.org)

changed this line in version 8 of the diff

changed this line in [version 8 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=5994&start_sha=324305e8aa1cce4becada70e7029e4453f2b0cdd#c8dd4cd30c79ae86053a5acb64d7bf496e827643_48_42)
yuha commented 2021-03-19 16:14:42 +01:00 (Migrated from edugit.org)

added 3 commits

  • baece794 - Move filtering of timetables from template to views
  • 725c9990 - Reformat
  • f0b07d20 - Merge remote-tracking branch 'origin/83-review-permissions' into 83-review-permissions

Compare with previous version

added 3 commits <ul><li>baece794 - Move filtering of timetables from template to views</li><li>725c9990 - Reformat</li><li>f0b07d20 - Merge remote-tracking branch &#39;origin/83-review-permissions&#39; into 83-review-permissions</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=5994&start_sha=324305e8aa1cce4becada70e7029e4453f2b0cdd)
yuha commented 2021-03-19 16:18:35 +01:00 (Migrated from edugit.org)

resolved all threads

resolved all threads
yuha commented 2021-03-19 16:45:40 +01:00 (Migrated from edugit.org)

marked this merge request as ready

marked this merge request as **ready**
yuha commented 2021-03-19 17:16:11 +01:00 (Migrated from edugit.org)

marked this merge request as draft

marked this merge request as **draft**
yuha commented 2021-04-30 16:35:04 +02:00 (Migrated from edugit.org)

assigned to @yuha and unassigned @nik

assigned to @yuha and unassigned @nik
yuha commented 2021-05-15 21:08:33 +02:00 (Migrated from edugit.org)

added 35 commits

  • f0b07d20...69fda47f - 32 commits from branch master
  • 8769661a - Merge branch 'master' into 83-review-permissions
  • e28ad9e6 - Use custom queries to speed up permission filtering of timetables in overview
  • 0662f162 - Redo imports

Compare with previous version

added 35 commits <ul><li>f0b07d20...69fda47f - 32 commits from branch <code>master</code></li><li>8769661a - Merge branch &#39;master&#39; into 83-review-permissions</li><li>e28ad9e6 - Use custom queries to speed up permission filtering of timetables in overview</li><li>0662f162 - Redo imports</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=8325&start_sha=f0b07d20aefb58d9e55452d5b26e024e48786dbc)
yuha commented 2021-05-15 21:09:36 +02:00 (Migrated from edugit.org)

marked this merge request as ready

marked this merge request as **ready**
yuha commented 2021-05-15 21:15:08 +02:00 (Migrated from edugit.org)

added 2 commits

  • 1618796e - Use custom queries to speed up permission filtering of timetables in overview
  • 04626927 - Redo imports

Compare with previous version

added 2 commits <ul><li>1618796e - Use custom queries to speed up permission filtering of timetables in overview</li><li>04626927 - Redo imports</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=8328&start_sha=0662f162c2d4c62c66b258058c3b81414a61c588)
nik commented 2021-05-15 21:21:58 +02:00 (Migrated from edugit.org)
    if isinstance(obj, Group):
```suggestion:-0+0 if isinstance(obj, Group): ```
nik commented 2021-05-15 21:21:58 +02:00 (Migrated from edugit.org)
    elif isinstance(obj, Person):
```suggestion:-0+0 elif isinstance(obj, Person): ```
nik commented 2021-05-15 21:21:58 +02:00 (Migrated from edugit.org)
    elif isinstance(obj, Room):
```suggestion:-0+0 elif isinstance(obj, Room): ```
nik commented 2021-05-15 21:22:48 +02:00 (Migrated from edugit.org)

Please factor the three branches of the big predicate out into threee predicates

Please factor the three branches of the big predicate out into threee predicates
yuha commented 2021-05-15 21:38:34 +02:00 (Migrated from edugit.org)

changed this line in version 11 of the diff

changed this line in [version 11 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=8333&start_sha=0462692784d8676ba892d94e01f7c1f1855a1532#17c677c6fda266376a52865c127bc25f98cf2314_16_16)
yuha commented 2021-05-15 21:38:34 +02:00 (Migrated from edugit.org)

changed this line in version 11 of the diff

changed this line in [version 11 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=8333&start_sha=0462692784d8676ba892d94e01f7c1f1855a1532#17c677c6fda266376a52865c127bc25f98cf2314_24_35)
yuha commented 2021-05-15 21:38:34 +02:00 (Migrated from edugit.org)

changed this line in version 11 of the diff

changed this line in [version 11 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=8333&start_sha=0462692784d8676ba892d94e01f7c1f1855a1532#17c677c6fda266376a52865c127bc25f98cf2314_30_45)
yuha commented 2021-05-15 21:38:35 +02:00 (Migrated from edugit.org)

added 1 commit

  • 9e185f7a - Reformat predicates

Compare with previous version

added 1 commit <ul><li>9e185f7a - Reformat predicates</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=8333&start_sha=0462692784d8676ba892d94e01f7c1f1855a1532)
yuha commented 2021-05-15 21:38:46 +02:00 (Migrated from edugit.org)

resolved all threads

resolved all threads
yuha commented 2021-05-15 21:40:34 +02:00 (Migrated from edugit.org)

added 1 commit

Compare with previous version

added 1 commit <ul><li>3cfa597b - Reformat predicates</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=8334&start_sha=9e185f7a0c7d5221a03aef0e344d06b14c300905)
yuha commented 2021-05-15 21:51:23 +02:00 (Migrated from edugit.org)

added 38 commits

  • 3cfa597b...edd54e90 - 37 commits from branch master
  • 4d2ed6e3 - Merge branch 'master' into 83-review-permissions

Compare with previous version

added 38 commits <ul><li>3cfa597b...edd54e90 - 37 commits from branch <code>master</code></li><li>4d2ed6e3 - Merge branch &#39;master&#39; into 83-review-permissions</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=8337&start_sha=3cfa597b1881097896d49cde0cc2b6bd0acd7224)
yuha commented 2021-05-15 21:57:07 +02:00 (Migrated from edugit.org)

added 1 commit

  • da5c6b69 - Reformat docstrings

Compare with previous version

added 1 commit <ul><li>da5c6b69 - Reformat docstrings</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=8339&start_sha=4d2ed6e3938da64929e65cc3bd6a6b0dfa2d8cbe)
yuha commented 2021-05-15 22:15:07 +02:00 (Migrated from edugit.org)

added 1 commit

Compare with previous version

added 1 commit <ul><li>ebd013b7 - Reformat docstrings</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=8342&start_sha=da5c6b6962e96f5e821118760eeaa03f587cb5cd)
yuha commented 2021-05-15 22:23:42 +02:00 (Migrated from edugit.org)

assigned to @nik and unassigned @yuha

assigned to @nik and unassigned @yuha
nik commented 2021-05-16 00:17:56 +02:00 (Migrated from edugit.org)

Please add a docstring

Please add a docstring
nik commented 2021-05-16 00:17:56 +02:00 (Migrated from edugit.org)

Please add a docstring

Please add a docstring
nik commented 2021-05-16 00:17:57 +02:00 (Migrated from edugit.org)

Please add a docstring

Please add a docstring
yuha commented 2021-05-16 00:26:33 +02:00 (Migrated from edugit.org)

added 1 commit

Compare with previous version

added 1 commit <ul><li>c4ccb64d - Add docstrings</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=8355&start_sha=ebd013b7e479d60e710abaf481497f2dec774dd4)
yuha commented 2021-05-16 00:29:09 +02:00 (Migrated from edugit.org)

resolved all threads

resolved all threads
yuha commented 2021-05-16 00:49:22 +02:00 (Migrated from edugit.org)

changed this line in version 17 of the diff

changed this line in [version 17 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=8359&start_sha=c4ccb64d6062e5d76982214363432ab989f78302#d29e260234e8f51493408c2f159582b39a59f964_49_52)
yuha commented 2021-05-16 00:49:22 +02:00 (Migrated from edugit.org)

changed this line in version 17 of the diff

changed this line in [version 17 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=8359&start_sha=c4ccb64d6062e5d76982214363432ab989f78302#d29e260234e8f51493408c2f159582b39a59f964_73_76)
yuha commented 2021-05-16 00:49:22 +02:00 (Migrated from edugit.org)

changed this line in version 17 of the diff

changed this line in [version 17 of the diff](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=8359&start_sha=c4ccb64d6062e5d76982214363432ab989f78302#d29e260234e8f51493408c2f159582b39a59f964_107_110)
yuha commented 2021-05-16 00:49:23 +02:00 (Migrated from edugit.org)

added 1 commit

  • f35dfa9c - Use optional type annotations

Compare with previous version

added 1 commit <ul><li>f35dfa9c - Use optional type annotations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=8359&start_sha=c4ccb64d6062e5d76982214363432ab989f78302)
yuha commented 2021-05-16 12:09:13 +02:00 (Migrated from edugit.org)

added 2 commits

  • c0535967 - Use optional type annotations
  • ccc39204 - Fix get_classes queryset

Compare with previous version

added 2 commits <ul><li>c0535967 - Use optional type annotations</li><li>ccc39204 - Fix get_classes queryset</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=8383&start_sha=f35dfa9c32898f5e27d2ec859a808fe029670a71)
nik (Migrated from edugit.org) scheduled this pull request to auto merge when all checks succeed 2021-05-16 12:09:41 +02:00
yuha commented 2021-05-16 12:13:38 +02:00 (Migrated from edugit.org)

aborted the automatic merge because source branch was updated

aborted the automatic merge because source branch was updated
yuha commented 2021-05-16 12:13:39 +02:00 (Migrated from edugit.org)

added 2 commits

  • d0355a61 - Use optional type annotations
  • 56302895 - Fix get_classes queryset

Compare with previous version

added 2 commits <ul><li>d0355a61 - Use optional type annotations</li><li>56302895 - Fix get_classes queryset</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=8385&start_sha=ccc39204f730d8946de9f07875a72ebdeba3ab1e)
nik (Migrated from edugit.org) scheduled this pull request to auto merge when all checks succeed 2021-05-16 12:14:50 +02:00
yuha commented 2021-05-16 12:33:10 +02:00 (Migrated from edugit.org)

aborted the automatic merge because source branch was updated

aborted the automatic merge because source branch was updated
yuha commented 2021-05-16 12:33:11 +02:00 (Migrated from edugit.org)

added 1 commit

Compare with previous version

added 1 commit <ul><li>5f803edc - Fix get_classes queryset</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-App-Chronos/-/merge_requests/113/diffs?diff_id=8391&start_sha=563028954aa7ccb45e0017fea8079f60a03751ff)
nik (Migrated from edugit.org) scheduled this pull request to auto merge when all checks succeed 2021-05-16 12:38:55 +02:00
nik (Migrated from edugit.org) merged commit 186db4706a into master 2021-05-16 12:47:54 +02:00
nik commented 2021-05-16 12:47:57 +02:00 (Migrated from edugit.org)

mentioned in commit 186db4706a

mentioned in commit 186db4706a2ff8af31274ca6f03cd7273dea5bcb
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
aleksis/AlekSIS-App-Chronos!417
No description provided.