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
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Commits
42eedc00
Verified
Commit
42eedc00
authored
Aug 5, 2021
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Introduce a ExtensiblePolymorphicModel
parent
9a55dd98
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!701
Introduce an ExtensiblePolymorphicModel
Pipeline
#25557
passed with warnings
Aug 5, 2021
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.rst
+1
-0
1 addition, 0 deletions
CHANGELOG.rst
aleksis/core/managers.py
+4
-0
4 additions, 0 deletions
aleksis/core/managers.py
aleksis/core/mixins.py
+24
-1
24 additions, 1 deletion
aleksis/core/mixins.py
with
29 additions
and
1 deletion
CHANGELOG.rst
+
1
−
0
View file @
42eedc00
...
...
@@ -13,6 +13,7 @@ Added
~~~~~
* Allow apps to dynamically generate OAuth scopes
* Provide a ``ExtensiblePolymorphicModel`` to support the features of extensible models for polymorphic models and vice-versa.
Removed
~~~~~~~
...
...
This diff is collapsed.
Click to expand it.
aleksis/core/managers.py
+
4
−
0
View file @
42eedc00
...
...
@@ -120,3 +120,7 @@ class InstalledWidgetsDashboardWidgetOrderManager(Manager):
# [obj["id"] for obj in list(Person.objects.all().values("id"))]
return
super
().
get_queryset
().
filter
(
widget_id__in
=
dashboard_widget_pks
)
class
PolymorphicCurrentSiteManager
(
_CurrentSiteManager
,
PolymorphicManager
):
"""
Default manager for extensible, polymorphic models.
"""
This diff is collapsed.
Click to expand it.
aleksis/core/mixins.py
+
24
−
1
View file @
42eedc00
...
...
@@ -24,9 +24,16 @@ from guardian.admin import GuardedModelAdmin
from
guardian.core
import
ObjectPermissionChecker
from
jsonstore.fields
import
IntegerField
,
JSONFieldMixin
from
material.base
import
Layout
,
LayoutNode
from
polymorphic.base
import
PolymorphicModelBase
from
polymorphic.managers
import
PolymorphicManager
from
polymorphic.models
import
PolymorphicModel
from
rules.contrib.admin
import
ObjectPermissionsModelAdmin
from
aleksis.core.managers
import
CurrentSiteManagerWithoutMigrations
,
SchoolTermRelatedQuerySet
from
aleksis.core.managers
import
(
CurrentSiteManagerWithoutMigrations
,
PolymorphicCurrentSiteManager
,
SchoolTermRelatedQuerySet
,
)
class
_ExtensibleModelBase
(
models
.
base
.
ModelBase
):
...
...
@@ -351,6 +358,22 @@ class ExtensibleModel(models.Model, metaclass=_ExtensibleModelBase):
abstract
=
True
class
_ExtensiblePolymorphicModelBase
(
_ExtensibleModelBase
,
PolymorphicModelBase
):
"""
Base class for extensible, polymorphic models.
"""
class
ExtensiblePolymorphicModel
(
ExtensibleModel
,
PolymorphicModel
,
metaclass
=
_ExtensiblePolymorphicModelBase
):
"""
Model class for extensible, polymorphic models.
"""
objects
=
PolymorphicCurrentSiteManager
()
objects_all_sites
=
PolymorphicManager
()
class
Meta
:
abstract
=
True
class
PureDjangoModel
(
object
):
"""
No-op mixin to mark a model as deliberately not using ExtensibleModel.
"""
...
...
This diff is collapsed.
Click to expand it.
Jonathan Weth
@hansegucker
mentioned in commit
cae049c8
·
Oct 31, 2021
mentioned in commit
cae049c8
mentioned in commit cae049c835724f0c0420298886880436b265142e
Toggle commit list
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