Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Commits
ce4af0e0
Verified
Commit
ce4af0e0
authored
5 years ago
by
Tom Teichler
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into 113-add-django-dbsettings
parents
20ff7830
f84866f0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!63
WIP: Resolve "Add django-dbsettings"
Pipeline
#265
passed
5 years ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
biscuit/core/admin.py
+9
-0
9 additions, 0 deletions
biscuit/core/admin.py
biscuit/core/urls.py
+2
-0
2 additions, 0 deletions
biscuit/core/urls.py
with
11 additions
and
0 deletions
biscuit/core/admin.py
0 → 100644
+
9
−
0
View file @
ce4af0e0
from
django.contrib
import
admin
from
.models
import
Group
,
Person
,
School
,
SchoolTerm
admin
.
site
.
register
(
Person
)
admin
.
site
.
register
(
Group
)
admin
.
site
.
register
(
School
)
admin
.
site
.
register
(
SchoolTerm
)
This diff is collapsed.
Click to expand it.
biscuit/core/urls.py
+
2
−
0
View file @
ce4af0e0
from
django.apps
import
apps
from
django.contrib
import
admin
from
django.conf
import
settings
from
django.conf.urls.static
import
static
from
django.contrib.auth
import
views
as
auth_views
...
...
@@ -10,6 +11,7 @@ from two_factor.urls import urlpatterns as tf_urls
from
.
import
views
urlpatterns
=
[
path
(
'
admin/
'
,
admin
.
site
.
urls
),
path
(
'
data_management/
'
,
views
.
data_management
,
name
=
'
data_management
'
),
path
(
'
status/
'
,
views
.
system_status
,
name
=
'
system_status
'
),
path
(
'
school_management
'
,
views
.
school_management
,
name
=
'
school_management
'
),
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment