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
54a090f0
Verified
Commit
54a090f0
authored
5 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of edugit.org:AlekSIS/official/AlekSIS
parents
95478b79
c88afaef
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#1280
failed
5 years ago
Stage: test
Stage: build
Changes
2
Pipelines
4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+6
-0
6 additions, 0 deletions
Dockerfile
aleksis/core/views.py
+1
-1
1 addition, 1 deletion
aleksis/core/views.py
with
7 additions
and
1 deletion
Dockerfile
+
6
−
0
View file @
54a090f0
...
...
@@ -47,6 +47,7 @@ ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
# Install core extras
FROM
core
AS
core-extras
ARG
EXTRA_LDAP
ARG
EXTRA_CELERY
WORKDIR
/usr/src/app
# LDAP
...
...
@@ -58,6 +59,11 @@ RUN if [ $EXTRA_LDAP = 1 ] ; then \
eatmydata poetry
install
-E
ldap
;
\
fi
;
# Celery
RUN if
[
$EXTRA_CELERY
=
1
]
;
then
\
eatmydata poetry
install
-E
celery
;
\
fi
;
# Install official apps
FROM
core-extras
AS
apps
COPY
apps ./apps/
...
...
This diff is collapsed.
Click to expand it.
aleksis/core/views.py
+
1
−
1
View file @
54a090f0
...
...
@@ -82,7 +82,7 @@ def person(request: HttpRequest, id_: Optional[int] = None) -> HttpResponse:
context
[
"
person
"
]
=
person
# Get groups where person is member of
groups
=
Group
.
objects
.
filter
(
members
=
id_
)
groups
=
Group
.
objects
.
filter
(
members
=
person
)
# Build table
groups_table
=
GroupsTable
(
groups
)
...
...
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