Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Maják
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TO
Maják
Commits
d4deb3c8
Commit
d4deb3c8
authored
6 months ago
by
Alexa Valentová
Browse files
Options
Downloads
Patches
Plain Diff
fix minor errors
parent
e7998820
No related branches found
No related tags found
2 merge requests
!1165
Fix minor errors
,
!1164
Fix minor errors
Pipeline
#19949
passed
6 months ago
Stage: build
Changes
2
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
district/forms.py
+3
-2
3 additions, 2 deletions
district/forms.py
district/models.py
+3
-0
3 additions, 0 deletions
district/models.py
with
6 additions
and
2 deletions
district/forms.py
+
3
−
2
View file @
d4deb3c8
...
...
@@ -44,11 +44,12 @@ class DistrictPeoplePageForm(WagtailAdminPageForm):
if
collection_id
is
None
:
collection_id
=
Collection
.
objects
.
first
().
id
for
shortcut
in
self
.
instance
.
get_syncable_octopus_groups
():
for
group
in
self
.
instance
.
get_syncable_octopus_groups
():
import_people_from_group
.
delay
(
self
.
instance
.
id
,
collection_id
,
shortcut
,
group
[
"
shortcut
"
],
group
[
"
title
"
],
)
return
super
().
save
(
*
args
,
**
kwargs
)
...
...
This diff is collapsed.
Click to expand it.
district/models.py
+
3
−
0
View file @
d4deb3c8
...
...
@@ -778,6 +778,9 @@ class DistrictPeoplePage(MainPeoplePageMixin):
# with them around, convert roles to lists only after we know the teams
# are unique.
for
position
,
team
in
enumerate
(
unique_teams
):
if
team
[
"
roles
"
]
is
None
:
continue
unique_teams
[
position
][
"
roles
"
]
=
team
[
"
roles
"
].
split
(
"
,
"
)
return
unique_teams
...
...
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