Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Alsijil
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
Service Desk
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-Alsijil
Commits
c92022f0
Commit
c92022f0
authored
8 months ago
by
Hangzhi Yu
Browse files
Options
Downloads
Patches
Plain Diff
Add preference for priority group type in coursebook select field
parent
cc8f29d6
No related branches found
No related tags found
1 merge request
!394
Resolve "Show class groups at top of group select"
Pipeline
#192035
failed
8 months ago
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/alsijil/preferences.py
+18
-0
18 additions, 0 deletions
aleksis/apps/alsijil/preferences.py
aleksis/apps/alsijil/schema/__init__.py
+8
-1
8 additions, 1 deletion
aleksis/apps/alsijil/schema/__init__.py
with
26 additions
and
1 deletion
aleksis/apps/alsijil/preferences.py
+
18
−
0
View file @
c92022f0
...
@@ -6,6 +6,7 @@ from dynamic_preferences.types import (
...
@@ -6,6 +6,7 @@ from dynamic_preferences.types import (
BooleanPreference
,
BooleanPreference
,
ChoicePreference
,
ChoicePreference
,
IntegerPreference
,
IntegerPreference
,
ModelChoicePreference
,
ModelMultipleChoicePreference
,
ModelMultipleChoicePreference
,
)
)
...
@@ -203,3 +204,20 @@ class GroupTypesRegisterAbsence(ModelMultipleChoicePreference):
...
@@ -203,3 +204,20 @@ class GroupTypesRegisterAbsence(ModelMultipleChoicePreference):
help_text
=
_
(
help_text
=
_
(
"
If you leave it empty, all member of groups the user is an owner of will be shown.
"
"
If you leave it empty, all member of groups the user is an owner of will be shown.
"
)
)
@site_preferences_registry.register
class
GroupTypePriorityCoursebook
(
ModelChoicePreference
):
section
=
alsijil
name
=
"
group_type_priority_coursebook
"
required
=
False
default
=
None
model
=
GroupType
verbose_name
=
_
(
"
Group type of groups to be shown first in the group
"
"
select field on the coursebook overview page
"
)
help_text
=
_
(
"
If you leave it empty, no group type will be used.
"
)
def
get_queryset
(
self
):
return
GroupType
.
objects
.
managed_and_unmanaged
()
This diff is collapsed.
Click to expand it.
aleksis/apps/alsijil/schema/__init__.py
+
8
−
1
View file @
c92022f0
from
datetime
import
datetime
from
datetime
import
datetime
from
django.core.exceptions
import
PermissionDenied
from
django.core.exceptions
import
PermissionDenied
from
django.db.models
.query_utils
import
Q
from
django.db.models
import
BooleanField
,
ExpressionWrapper
,
Q
import
graphene
import
graphene
...
@@ -156,6 +156,13 @@ class Query(graphene.ObjectType):
...
@@ -156,6 +156,13 @@ class Query(graphene.ObjectType):
Group
.
objects
.
for_current_school_term_or_all
()
Group
.
objects
.
for_current_school_term_or_all
()
.
filter
(
Q
(
members
=
person
)
|
Q
(
owners
=
person
)
|
Q
(
parent_groups__owners
=
person
))
.
filter
(
Q
(
members
=
person
)
|
Q
(
owners
=
person
)
|
Q
(
parent_groups__owners
=
person
))
.
distinct
()
.
distinct
()
.
annotate
(
is_priority
=
ExpressionWrapper
(
Q
(
group_type
=
get_site_preferences
()[
"
alsijil__group_type_priority_coursebook
"
]),
output_field
=
BooleanField
(),
)
)
.
order_by
(
"
is_priority
"
)
)
)
@staticmethod
@staticmethod
...
...
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