Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
682 commits
Select commit Hold shift + click to select a range
ef56fc0
Validators test fixed
PaKZer0 Oct 31, 2019
9f9f71e
Merge pull request #36 from SUNET/candidate
PaKZer0 Oct 31, 2019
c01bfae
Added queries for role models and groups
PaKZer0 Oct 31, 2019
1a49de2
Added queries to tests
PaKZer0 Oct 31, 2019
b8ad5cf
Added test with the parent_id call
PaKZer0 Oct 31, 2019
11483d9
Added manual create/update class to the mutation factory
PaKZer0 Oct 31, 2019
e440eb9
Change of the var name
PaKZer0 Nov 5, 2019
4bd0e81
The stacked filters are mixed with an AND instead an OR
PaKZer0 Nov 6, 2019
c054965
Added query parenthesis
PaKZer0 Nov 6, 2019
62985de
Added fix util to rename existent organization property
PaKZer0 Nov 6, 2019
d057e0b
Small fix on move property function
PaKZer0 Nov 6, 2019
73f44b5
Added validation on organization_id
PaKZer0 Nov 6, 2019
8c768b8
Added edit check
PaKZer0 Nov 6, 2019
88bccb1
Changes in order to allow subentity string filtering
PaKZer0 Nov 6, 2019
efb494a
Check condition, so it doesn't try to filter a non string value
PaKZer0 Nov 6, 2019
47c8491
Ignore non string query functions if the subentity value is not a string
PaKZer0 Nov 7, 2019
9d62e32
Fixed multiple subentity query
PaKZer0 Nov 7, 2019
eab98f3
Added boolean fields to filter
PaKZer0 Nov 7, 2019
f0d68c6
The affiliation fields are now set to false through a migration
PaKZer0 Nov 7, 2019
a158b21
Add counter query and change contact_type from string to choice
PaKZer0 Nov 7, 2019
6b6ffea
Add choicescalar to filtrable attributes
PaKZer0 Nov 7, 2019
87ca291
Added organization_number field
PaKZer0 Nov 7, 2019
ec8385d
Added organization_number
PaKZer0 Nov 7, 2019
fa78d2e
Improved validation
PaKZer0 Nov 8, 2019
c1a8902
Add check existent organization_id to a graphql query
PaKZer0 Nov 8, 2019
e3dcc33
Merge branch 'multiple-org' into candidate
PaKZer0 Nov 8, 2019
71357c4
Merge branch 'and-filter' into candidate
PaKZer0 Nov 8, 2019
42bf950
Merge branch 'orgid-unique' into candidate
PaKZer0 Nov 8, 2019
7bb8302
Merge branch 'nocroles-query' into candidate
PaKZer0 Nov 8, 2019
22239ac
Merge fix
PaKZer0 Nov 8, 2019
adc7e9a
Another merge fix
PaKZer0 Nov 8, 2019
714b5f7
Merge pull request #37 from SUNET/candidate
PaKZer0 Nov 8, 2019
bb5b15b
user profile
enriquepablo Nov 8, 2019
479d63e
Control over the instantiation of filter input classes and nested attrib
PaKZer0 Nov 8, 2019
e068fea
PIL support
enriquepablo Nov 11, 2019
8bcdcec
avatar field
enriquepablo Nov 11, 2019
63537fa
api authentication
enriquepablo Nov 11, 2019
5d2e9da
WIP ordering by nested fields
PaKZer0 Nov 11, 2019
a5ed0bd
Small fix wip
PaKZer0 Nov 12, 2019
a23d999
Added contacts that belong to a group to attributes
PaKZer0 Nov 12, 2019
2be984a
whoami method
enriquepablo Nov 12, 2019
9a6e5bc
WIP composite mutation
PaKZer0 Nov 12, 2019
ca6a10a
Added correct payload
PaKZer0 Nov 12, 2019
2445c45
WIP Subentity processor (not stable for the moment)
PaKZer0 Nov 13, 2019
0062553
Corrected issue with relation proccessors
PaKZer0 Nov 13, 2019
95c5e07
Composite mutation for Groups first functional errors (needs tests)
PaKZer0 Nov 13, 2019
0495593
Deleted log message
PaKZer0 Nov 13, 2019
e702197
Add process subentities in edit mutation and checks before operation
PaKZer0 Nov 13, 2019
b782482
Creation composite test
PaKZer0 Nov 14, 2019
8a10471
Added to new test module
PaKZer0 Nov 14, 2019
906b6b4
Added nex checks
PaKZer0 Nov 14, 2019
6648d3d
Removed development code
PaKZer0 Nov 14, 2019
a7d9026
WIP composite mutation organizations
PaKZer0 Nov 14, 2019
5f9bb72
Organization complex mutation 1st functional version with create test
PaKZer0 Nov 15, 2019
61d07ff
Added check for contacts
PaKZer0 Nov 15, 2019
8392c9e
Small fix on test
PaKZer0 Nov 15, 2019
0c479e5
Address tested and fixed for organizations composite mutation
PaKZer0 Nov 15, 2019
7726d04
Completed address test
PaKZer0 Nov 15, 2019
98ce9d8
Added link contact/organization mutation
PaKZer0 Nov 15, 2019
fae94c5
Prototype of CompositeContactMutation
PaKZer0 Nov 18, 2019
21f81e8
Added link mutation for contacts-organizations in composite mutation
PaKZer0 Nov 18, 2019
6d0c8da
Removed double linking
PaKZer0 Nov 18, 2019
1e26115
Replaced helper method
PaKZer0 Nov 18, 2019
009dd43
Completed create test for composite contacts
PaKZer0 Nov 18, 2019
4fcd822
whoami view
enriquepablo Nov 19, 2019
f02f80a
Improved test suite
PaKZer0 Nov 19, 2019
33795f2
Added second contact and address on create organization
PaKZer0 Nov 19, 2019
a8b5988
Fixes on nested creation/update of subyacent entities in mutations
PaKZer0 Nov 19, 2019
81131d1
Expanded test for composite organization and bugfixes
PaKZer0 Nov 19, 2019
cc0e20f
Added update test for organizations
PaKZer0 Nov 20, 2019
a0b1073
Tests checks for the role of a subyacent contact on edit. That's fixed
PaKZer0 Nov 20, 2019
e85928d
add dependecie pillow
Nov 20, 2019
9b9ba2e
Removed malfunctional role permission checking
PaKZer0 Nov 20, 2019
a508d22
Added unlink mutations to the composite mutation
PaKZer0 Nov 20, 2019
55496cc
Improved test for Organization composite mutation, added unlink nodes
PaKZer0 Nov 20, 2019
90722bf
Added update contact test
PaKZer0 Nov 20, 2019
6a05700
Added an altered version of the contact test
PaKZer0 Nov 21, 2019
a5fa258
Extended order parameters completed
PaKZer0 Nov 21, 2019
9fc8165
Check for duplicates handle_id befor adding it to the list
PaKZer0 Nov 21, 2019
ffdc609
Merge branch 'connfilters' into composite-mutations
PaKZer0 Nov 21, 2019
131f603
Added choice scalar to the filter fields building
PaKZer0 Nov 21, 2019
3a072ac
Merge branch 'connfilters' into candidate
PaKZer0 Nov 21, 2019
631a404
Fixed order for date fields
PaKZer0 Nov 21, 2019
d8c6f47
Merge branch 'connfilters' into candidate
PaKZer0 Nov 21, 2019
3af50c4
Improved scalar filter on neo4j
PaKZer0 Nov 21, 2019
2810b15
Merge branch 'connfilters' into candidate
PaKZer0 Nov 21, 2019
d21bc9d
Added organization order tests
PaKZer0 Nov 22, 2019
1102fcb
Added organization filter tests
PaKZer0 Nov 22, 2019
1f96dc5
Added contact connection test
PaKZer0 Nov 22, 2019
df90c86
Improvement of nested order and filter
PaKZer0 Nov 22, 2019
ad3d5ca
Merge branch 'connfilters' into candidate
PaKZer0 Nov 22, 2019
a90d18b
add profile update
Nov 22, 2019
2368139
Merge pull request #38 from SUNET/candidate
PaKZer0 Nov 22, 2019
6701422
uncomment decorator
Nov 22, 2019
d510894
Merge pull request #39 from SUNET/eperez-user-profile
PaKZer0 Nov 22, 2019
52d7679
Added cookie domain to envvars
PaKZer0 Nov 25, 2019
32890b9
Merge pull request #40 from SUNET/envvars
PaKZer0 Nov 25, 2019
ff65984
Added helper method to update role relationship
PaKZer0 Nov 27, 2019
b2d1961
Added mutation relation_id to the contact composite mutation
PaKZer0 Nov 27, 2019
f5248b1
Changes for per type default read context
PaKZer0 Nov 28, 2019
55b1332
Added type determined context to some mutations and tests
PaKZer0 Nov 28, 2019
6839e8b
Context is now determined by a composite mutation attribute or by type
PaKZer0 Nov 28, 2019
ed9bd51
Data fixer created and tested
PaKZer0 Dec 5, 2019
729e99f
Removed unused queries from api and tests
PaKZer0 Dec 10, 2019
9ba2bb1
Removed multiple mutations
PaKZer0 Dec 10, 2019
8d78d0e
Basic data generator and files
PaKZer0 Dec 11, 2019
fb1a696
Fixed address in generator
PaKZer0 Dec 12, 2019
da71d68
Stress test wip
PaKZer0 Dec 12, 2019
9706d9a
Added error to delete mutation if the nodehandle doesn't exists
PaKZer0 Dec 12, 2019
965fbad
Moved property_update to its right metaclass
PaKZer0 Dec 13, 2019
0a3f371
Added order to list resolution
PaKZer0 Dec 16, 2019
febf973
Skip test decorator, contact list test and improvement of the code
PaKZer0 Dec 16, 2019
3f948b8
Groups added to the data load
PaKZer0 Dec 17, 2019
bedf270
Added group query
PaKZer0 Dec 17, 2019
9c578a1
Removed debug line
PaKZer0 Dec 17, 2019
11f431e
Added logging of results,and high stress test
PaKZer0 Dec 17, 2019
433d7d5
Parametrization of order and handle_id/name double test
PaKZer0 Dec 17, 2019
32770b0
Added default value for envvar
PaKZer0 Dec 18, 2019
b75ee54
Merge branch 'implicit-modules' into release
PaKZer0 Dec 18, 2019
87172db
Merge branch 'orgtypes-fix' into release
PaKZer0 Dec 18, 2019
6e116f7
Merge branch 'update-relations' into release
PaKZer0 Dec 18, 2019
81c772e
Merge branch 'stress-test' into release
PaKZer0 Dec 18, 2019
290c101
Merge branch 'trimmed-api' into release
PaKZer0 Dec 18, 2019
421871d
Added small admin form for GroupContextAuthzAction
PaKZer0 Nov 25, 2019
d48f88d
Added NodeHandleContext to the admin forms
PaKZer0 Nov 26, 2019
6be83c1
Shortened to string method
PaKZer0 Nov 26, 2019
2286739
Merge branch 'admin-modules' into release
PaKZer0 Dec 18, 2019
8cf13bb
Merge pull request #41 from SUNET/release
PaKZer0 Dec 19, 2019
eef1650
Removed handle_id from connection filter
PaKZer0 Dec 20, 2019
17533e0
Change from handle_id to id in getById resolver
PaKZer0 Dec 20, 2019
0fba5ee
Switch from handle_id to id on mutations
PaKZer0 Dec 23, 2019
c49de81
New id for nested contacts (subentity processors)
PaKZer0 Dec 23, 2019
eb23132
Organization and Group mutations fully switched with tests
PaKZer0 Dec 23, 2019
0f2379f
Complex mutations tests fixed for the new id type
PaKZer0 Jan 7, 2020
1c7bbe8
WIP Schema tests corrected
PaKZer0 Jan 7, 2020
870d8f7
Removed old code
PaKZer0 Jan 7, 2020
e71ed96
Merge pull request #42 from SUNET/hotfix
PaKZer0 Jan 7, 2020
3dfc6f9
Removed handle_id from connection filter
PaKZer0 Dec 20, 2019
f773ed7
Change from handle_id to id in getById resolver
PaKZer0 Dec 20, 2019
23cf13f
Switch from handle_id to id on mutations
PaKZer0 Dec 23, 2019
dcc4122
New id for nested contacts (subentity processors)
PaKZer0 Dec 23, 2019
fc7b665
Organization and Group mutations fully switched with tests
PaKZer0 Dec 23, 2019
90d8386
Complex mutations tests fixed for the new id type
PaKZer0 Jan 7, 2020
d3df3e2
WIP Schema tests corrected
PaKZer0 Jan 7, 2020
4153295
Merge branch 'node-id' of https://github.com/SUNET/ni into node-id
PaKZer0 Jan 7, 2020
2126d61
Added relay id to the connections filter
PaKZer0 Jan 7, 2020
b6e68a4
Connection query build method fixed for new relay id
PaKZer0 Jan 8, 2020
01bfcb8
Id switched for comments. Mutations tests had been modularized.
PaKZer0 Jan 8, 2020
25d57cd
Mutations test updated to the relay id
PaKZer0 Jan 8, 2020
d6f242e
Role id is now informed in the simple contact mutations
PaKZer0 Jan 9, 2020
b65ad0f
Cookies are now secured
PaKZer0 Jan 20, 2020
49a0af3
Simplified config to work both with http in local & https in stg/pre/pro
PaKZer0 Jan 21, 2020
731a6f1
Cable node generator
PaKZer0 Jan 24, 2020
353eea6
Added provider generation
PaKZer0 Jan 24, 2020
d0ef272
CLI django management
PaKZer0 Jan 24, 2020
503ecb6
Link provider to cable
PaKZer0 Jan 24, 2020
970c83b
Code refactored and ports added to the data generation
PaKZer0 Jan 24, 2020
42caea0
Ports added to the cable and improved delete
PaKZer0 Jan 24, 2020
82fcce6
Improved fake node creation and added host to the generator
PaKZer0 Jan 24, 2020
8bc09f1
Added middleware that replaces Session and AuthenticationMiddleware
PaKZer0 Jan 21, 2020
2ed841b
Session is only created if is not already present
PaKZer0 Jan 22, 2020
163b454
Code copied and edited fron SessionMiddleware to create the cookie
PaKZer0 Jan 22, 2020
d8c1870
Rename of class
PaKZer0 Jan 22, 2020
44667b9
Typo fix
PaKZer0 Jan 22, 2020
a3c316b
Improve session cookie creation
PaKZer0 Jan 22, 2020
80aecd5
Improvement on response cycle
PaKZer0 Jan 22, 2020
c155645
delete jwt cookie on logout
PaKZer0 Jan 23, 2020
3a110c5
Ip field for host corrected
PaKZer0 Jan 27, 2020
2027e4f
logout view outputs a render response instead a redirect
PaKZer0 Jan 28, 2020
39e475b
Change to a failsafe view that performs a js cookie delete.
PaKZer0 Jan 28, 2020
0c82481
From cdn to local
PaKZer0 Jan 28, 2020
81e4c7c
Hardcoded cookie domain changed to envvar
PaKZer0 Jan 28, 2020
78d22d1
Merge branch 'jwtsession' into jwtsetup
PaKZer0 Jan 29, 2020
a22f05a
Catch exception on context init
PaKZer0 Jan 29, 2020
ae343ae
Swapped handle_id/id in a custom query
PaKZer0 Feb 7, 2020
a185b91
New field and resolver which relates the entities with the relation_id
PaKZer0 Feb 7, 2020
b279a80
Attribute name change
PaKZer0 Feb 7, 2020
1f5e2c6
Added switches and routers
PaKZer0 Feb 10, 2020
9390f6f
Merge branch 'local-setup' into release
PaKZer0 Feb 13, 2020
eb0144b
Merge branch 'jwtsetup' into release
PaKZer0 Feb 13, 2020
8346127
Merge branch 'net-testdata' into release
PaKZer0 Feb 13, 2020
8e12a06
Merge branch 'node-id' into release
PaKZer0 Feb 13, 2020
7ba71b9
Merge branch 'init-bugfix' into release
PaKZer0 Feb 13, 2020
d8fc4d3
Removed from excluded_fields
PaKZer0 Feb 13, 2020
801f4dc
Merge branch 'node-id' into release
PaKZer0 Feb 13, 2020
d766305
If role id is not specified it should be set to employee
PaKZer0 Feb 14, 2020
3257a96
Merge branch 'node-id' into release
PaKZer0 Feb 14, 2020
101d35b
Remove the harcoded value, every environment will have the envvar set
PaKZer0 Feb 19, 2020
5f02d5a
Added customers and end users
PaKZer0 Feb 21, 2020
7b317a8
Merge branch 'net-testdata' into release
PaKZer0 Feb 21, 2020
9e1e6b3
Bugfix on the command line util
PaKZer0 Feb 21, 2020
0c79933
Small bugfix on the progress bar
PaKZer0 Feb 21, 2020
6f044a7
Peering partners and groups added
PaKZer0 Feb 21, 2020
d08802e
Merge branch 'net-testdata' into release
PaKZer0 Feb 24, 2020
b7c7053
Add django-vakt to requirements
PaKZer0 Feb 24, 2020
4998f6f
Merge branch 'init-bugfix' into release
PaKZer0 Feb 24, 2020
5e7c031
Refresh jwt token if we have an authenticated session
PaKZer0 Feb 24, 2020
9a8f14f
Merge branch 'jwtsession' into jwtsetup
PaKZer0 Feb 24, 2020
efc342d
Merge branch 'jwtsetup' into release
PaKZer0 Feb 24, 2020
8ac767d
SRIJWTCookieMiddleware removed. Token refreshed if session is valid
PaKZer0 Feb 24, 2020
f68a336
Merge branch 'jwtsession' into jwtsetup
PaKZer0 Feb 24, 2020
0632867
Merge branch 'jwtsetup' into release
PaKZer0 Feb 24, 2020
fc720dd
Added context to the Organizations entities generation
PaKZer0 Feb 27, 2020
0db2888
Merge branch 'net-testdata' into release
PaKZer0 Feb 27, 2020
19b3bba
Fixed context setting
PaKZer0 Feb 27, 2020
809e49d
Merge branch 'net-testdata' into release
PaKZer0 Feb 27, 2020
8480840
Added expiration control
PaKZer0 Mar 3, 2020
9ab21af
Merge branch 'jwtsession' into jwtsetup
PaKZer0 Mar 3, 2020
816b424
Merge branch 'jwtsetup' into release
PaKZer0 Mar 3, 2020
bf6e57e
Added peering partners, peering groups and site owners to data generator
PaKZer0 Mar 3, 2020
c2666b9
Typo in list
PaKZer0 Mar 3, 2020
46e044a
Merge branch 'net-testdata' into release
PaKZer0 Mar 3, 2020
f45fe6d
ASN added to Peering partners
PaKZer0 Mar 3, 2020
61f8b65
Merge branch 'net-testdata' into release
PaKZer0 Mar 4, 2020
5567015
Merge pull request #43 from SUNET/release
PaKZer0 Mar 4, 2020
3105fad
JWT middleware fix when token is expired or not valid
PaKZer0 Mar 13, 2020
d50569a
Merge pull request #44 from SUNET/jwthotfix
PaKZer0 Mar 13, 2020
b811d54
Add user to all groups admin command and test
PaKZer0 Mar 16, 2020
019a2a7
Instead redirecting, now it gets the user from session and refresh token
PaKZer0 Mar 16, 2020
c10ec93
Merge pull request #45 from SUNET/jwt-hotfix
PaKZer0 Mar 16, 2020
632a80f
Merge pull request #46 from SUNET/usrgroups-cmd
PaKZer0 Mar 18, 2020
aa7f88f
Bugfixes from graphtypes-split on the datagenerator
PaKZer0 Mar 18, 2020
e49d081
Merge pull request #47 from SUNET/fakedata-bugfix
PaKZer0 Mar 18, 2020
88103de
Removed management command
PaKZer0 Mar 18, 2020
a315915
Merge pull request #48 from SUNET/remove-cmd
PaKZer0 Mar 18, 2020
f8004ff
CORS whitelist is defined in the SRI_FRONTEND_URL envvar
PaKZer0 Mar 20, 2020
c2e59a7
Merge pull request #49 from SUNET/cors-improv
PaKZer0 Mar 20, 2020
8d29247
Added fallback to clean rogue nodetype.
PaKZer0 Mar 20, 2020
c7f6303
Corrections on how CORS policy should be run in the different envs
PaKZer0 Mar 23, 2020
4fb1d0b
Merge pull request #50 from SUNET/cors-fix
PaKZer0 Mar 23, 2020
b83490c
If the user profile doesn't exists, create it
PaKZer0 Mar 24, 2020
f8fd7a7
Merge pull request #51 from SUNET/userprofile-fix
PaKZer0 Mar 24, 2020
5dd939a
Change not logged exception when the user doesn't have rigths over nodes
PaKZer0 Mar 25, 2020
8ba4770
Merge pull request #52 from SUNET/empty-lists
PaKZer0 Mar 25, 2020
8ecfd6d
Bugfix: relationship_parent_of field was not using relay id for update
PaKZer0 Mar 25, 2020
249088f
Merge pull request #53 from SUNET/org-parentid
PaKZer0 Mar 25, 2020
d917b9f
Enabled validators and fixed test
PaKZer0 Mar 25, 2020
f539aa3
Merge pull request #54 from SUNET/validation-fix
PaKZer0 Mar 25, 2020
8c73669
Fix: An empty connection is returned if the user doesn't have rights
PaKZer0 Mar 26, 2020
60be876
Merge pull request #55 from SUNET/null-connection-fix
PaKZer0 Mar 26, 2020
bb30c5d
Fix:The GroupContextAuthzAction objs are created regardless of the users
PaKZer0 Mar 26, 2020
bc74843
Merge pull request #56 from SUNET/groupaacontext-fix
PaKZer0 Mar 26, 2020
7bab73c
Merge branch 'master' into merge_upstream
PaKZer0 Mar 26, 2020
5954481
Merge br 'master' of https://github.com/NORDUnet/ni into merge_upstream
PaKZer0 Mar 26, 2020
f4ab6b1
Add migration left out by merge
PaKZer0 Mar 27, 2020
37298b7
Bugfix and config change: Session expires at browser close
PaKZer0 Mar 30, 2020
3ac3eb3
Merge pull request #57 from SUNET/cookie-expire
PaKZer0 Mar 30, 2020
6d63dd7
Merge branch 'master' into merge_upstream
PaKZer0 Mar 30, 2020
fc4a3d9
Merge migration
PaKZer0 Mar 31, 2020
bba7fb4
Fix on userprofile_link tag
PaKZer0 Mar 31, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FROM alpine:latest
FROM python:3.7-alpine
LABEL authors="Markus Krogh <[email protected]>"

RUN apk add --no-cache ca-certificates python3 libpq
RUN apk add --no-cache ca-certificates
RUN apk --update add python3-dev libpq libxml2-dev libxslt-dev libffi-dev gcc musl-dev libgcc openssl-dev curl
RUN apk add jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev py-pillow
RUN pip3 install --upgrade pip
RUN mkdir /app
WORKDIR /app
Expand Down
6 changes: 6 additions & 0 deletions requirements/common.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,9 @@ django-dotenv<1.5
django-dynamic-preferences<2.0
django-attachments<2.0
configparser
graphene-django>=2.0
django-cors-headers
vakt
django-vakt
django-graphql-jwt
Pillow
4 changes: 4 additions & 0 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
-r common.txt
ipython
django-nose<1.5
django-extensions
ipdb
Faker
18 changes: 12 additions & 6 deletions src/niweb/apps/noclook/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
from django.contrib.auth.admin import UserAdmin
from django.contrib.auth.models import User

from .models import NodeHandle, NodeType, UniqueIdGenerator, NordunetUniqueId, OpticalNodeType, ServiceType, ServiceClass, Dropdown, Choice, SwitchType
from .models import NodeHandle, NodeType, Role, RoleGroup, UniqueIdGenerator,\
NordunetUniqueId, OpticalNodeType, ServiceType, ServiceClass, Dropdown, \
Choice, GroupContextAuthzAction, NodeHandleContext, SwitchType

class UserModelAdmin(UserAdmin):
inlines = [ApiKeyInline]
Expand All @@ -13,15 +15,15 @@ class NodeHandleAdmin(admin.ModelAdmin):
list_filter = ('node_type', 'creator')
search_fields = ['node_name']
actions = ['delete_object']

# Remove the bulk delete option from the admin interface as it does not
# run the NodeHandle delete-function.
def get_actions(self, request):
actions = super(NodeHandleAdmin, self).get_actions(request)
if 'delete_selected' in actions:
del actions['delete_selected']
return actions

def delete_object(self, request, queryset):
deleted = 0
for obj in queryset:
Expand All @@ -33,20 +35,20 @@ def delete_object(self, request, queryset):
message_bit = "%s NodeHandles were" % deleted
self.message_user(request, "%s successfully deleted." % message_bit)
delete_object.short_description = "Delete the selected NodeHandle(s)"


class NodeTypeAdmin(admin.ModelAdmin):
prepopulated_fields = {'slug': ('type',)}
actions = ['delete_object']

# Remove the bulk delete option from the admin interface as it does not
# run the NodeHandle delete-function.
def get_actions(self, request):
actions = super(NodeTypeAdmin, self).get_actions(request)
if 'delete_selected' in actions:
del actions['delete_selected']
return actions

def delete_object(self, request, queryset):
deleted = 0
for obj in queryset:
Expand Down Expand Up @@ -102,4 +104,8 @@ class SwitchTypeAdmin(admin.ModelAdmin):
admin.site.register(ServiceClass)
admin.site.register(Dropdown, DropdownAdmin)
admin.site.register(Choice, ChoiceAdmin)
admin.site.register(RoleGroup)
admin.site.register(Role)
admin.site.register(GroupContextAuthzAction)
admin.site.register(NodeHandleContext)
admin.site.register(SwitchType, SwitchTypeAdmin)
8 changes: 8 additions & 0 deletions src/niweb/apps/noclook/dynamic_preferences_registry.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@ class MoreInfoLink(StringPreference):
help_text = 'Base url for more information links on detail pages'


@global_preferences_registry.register
class NOCLookMenuMode(StringPreference):
section = general
name = 'menu_mode'
default = 'ni'
help_text = 'sri|ni'


@global_preferences_registry.register
class PageFlashMessage(StringPreference):
section = announcements
Expand Down
Loading