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
6d843009
Verified
Commit
6d843009
authored
5 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Patches
Plain Diff
Use more specific helper methods
parent
3fd88ce6
No related branches found
No related tags found
1 merge request
!305
Allow adding a foreign key to Exensible Model
Pipeline
#2653
passed
5 years ago
Stage: test
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/core/mixins.py
+5
-6
5 additions, 6 deletions
aleksis/core/mixins.py
with
5 additions
and
6 deletions
aleksis/core/mixins.py
+
5
−
6
View file @
6d843009
...
@@ -223,7 +223,6 @@ class ExtensibleModel(models.Model, metaclass=_ExtensibleModelBase):
...
@@ -223,7 +223,6 @@ class ExtensibleModel(models.Model, metaclass=_ExtensibleModelBase):
id_field
=
to_field_type
()
id_field
=
to_field_type
()
self
.
field
(
**
{
id_field_name
:
id_field
})
self
.
field
(
**
{
id_field_name
:
id_field
})
@property
def
_virtual_fk
(
self
)
->
Optional
[
models
.
Model
]:
def
_virtual_fk
(
self
)
->
Optional
[
models
.
Model
]:
id_field_val
=
getattr
(
self
,
id_field_name
)
id_field_val
=
getattr
(
self
,
id_field_name
)
if
id_field_val
:
if
id_field_val
:
...
@@ -237,6 +236,10 @@ class ExtensibleModel(models.Model, metaclass=_ExtensibleModelBase):
...
@@ -237,6 +236,10 @@ class ExtensibleModel(models.Model, metaclass=_ExtensibleModelBase):
else
:
else
:
return
None
return
None
# Add property to wrap get/set on foreign mdoel instance
cls
.
property
(
_virtual_fk
,
field_name
)
_virtual_fk
=
getattr
(
cls
,
field_name
)
@_virtual_fk.setter
@_virtual_fk.setter
def
_virtual_fk
(
self
,
value
:
Optional
[
Model
]
=
None
)
->
None
:
def
_virtual_fk
(
self
,
value
:
Optional
[
Model
]
=
None
)
->
None
:
if
value
is
None
:
if
value
is
None
:
...
@@ -245,13 +248,9 @@ class ExtensibleModel(models.Model, metaclass=_ExtensibleModelBase):
...
@@ -245,13 +248,9 @@ class ExtensibleModel(models.Model, metaclass=_ExtensibleModelBase):
id_field_val
=
getattr
(
value
,
to_field
)
id_field_val
=
getattr
(
value
,
to_field
)
setattr
(
self
,
id_field_name
,
id_field_val
)
setattr
(
self
,
id_field_name
,
id_field_val
)
# Add property to wrap get/set on foreign mdoel instance
cls
.
_safe_add
(
_virtual_fk
,
field_name
)
# Add related property on foreign model instance if it provides such an interface
# Add related property on foreign model instance if it provides such an interface
if
hasattr
(
to
,
"
_safe_add
"
):
if
hasattr
(
to
,
"
_safe_add
"
):
@property
def
_virtual_related
(
self
)
->
Optional
[
models
.
Model
]:
def
_virtual_related
(
self
)
->
Optional
[
models
.
Model
]:
id_field_val
=
getattr
(
self
,
to_field
)
id_field_val
=
getattr
(
self
,
to_field
)
try
:
try
:
...
@@ -260,7 +259,7 @@ class ExtensibleModel(models.Model, metaclass=_ExtensibleModelBase):
...
@@ -260,7 +259,7 @@ class ExtensibleModel(models.Model, metaclass=_ExtensibleModelBase):
# Nothing references us
# Nothing references us
return
None
return
None
to
.
_safe_add
(
_virtual_related
,
related_name
)
to
.
property
(
_virtual_related
,
related_name
)
@classmethod
@classmethod
def
syncable_fields
(
cls
)
->
List
[
models
.
Field
]:
def
syncable_fields
(
cls
)
->
List
[
models
.
Field
]:
...
...
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