Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

LOFAR
- Activity
- Members
- Labels
- Issues
- Wiki
- Jira issues
- Open Jira
- Environments
- Terraform modules

Snippets Groups Projects

d66feb04

Commit d66feb04 authored 4 years ago by Jörn Künsemöller

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/TMSS-445' into TMSS-445-merge

parents 6027255a 6e3f4c24

No related branches found

Tags LOFAR-Release-3_2_13

1 merge request!378Resolve TMSS-445 "Merge"

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

SAS/TMSS/backend/src/tmss/tmssapp/migrations/0002_populate.py 4 additions, 1 deletion

...TMSS/backend/src/tmss/tmssapp/migrations/0002_populate.py
SAS/TMSS/backend/src/tmss/tmssapp/models/CMakeLists.txt 1 addition, 0 deletions

SAS/TMSS/backend/src/tmss/tmssapp/models/CMakeLists.txt
SAS/TMSS/backend/src/tmss/tmssapp/models/permissions.py 20 additions, 0 deletions

SAS/TMSS/backend/src/tmss/tmssapp/models/permissions.py
SAS/TMSS/backend/src/tmss/tmssapp/populate.py 99 additions, 0 deletions

SAS/TMSS/backend/src/tmss/tmssapp/populate.py
SAS/TMSS/backend/src/tmss/tmssapp/viewsets/lofar_viewset.py 46 additions, 11 deletions

SAS/TMSS/backend/src/tmss/tmssapp/viewsets/lofar_viewset.py
SAS/TMSS/backend/src/tmss/tmssapp/viewsets/permissions.py 2 additions, 3 deletions

SAS/TMSS/backend/src/tmss/tmssapp/viewsets/permissions.py
SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py 1 addition, 0 deletions

SAS/TMSS/backend/src/tmss/tmssapp/viewsets/scheduling.py
SAS/TMSS/backend/src/tmss/tmssapp/viewsets/specification.py 0 additions, 2 deletions

SAS/TMSS/backend/src/tmss/tmssapp/viewsets/specification.py
SAS/TMSS/test/t_tmssapp_permissions_system_roles.py 95 additions, 0 deletions

SAS/TMSS/test/t_tmssapp_permissions_system_roles.py

with 268 additions and 17 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment