Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Abi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
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
Lloyd Meins
AlekSIS-App-Abi
Commits
8b275ba9
Commit
8b275ba9
authored
3 years ago
by
Julian
Browse files
Options
Downloads
Patches
Plain Diff
Merge first_name and last_name of AbiPerson
parent
703abc62
No related branches found
No related tags found
1 merge request
!1
Resolve "Implement models"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/abi/migrations/0001_initial.py
+2
-3
2 additions, 3 deletions
aleksis/apps/abi/migrations/0001_initial.py
aleksis/apps/abi/models.py
+1
-2
1 addition, 2 deletions
aleksis/apps/abi/models.py
with
3 additions
and
5 deletions
aleksis/apps/abi/migrations/0001_initial.py
+
2
−
3
View file @
8b275ba9
# Generated by Django 3.2.4 on 2021-07-
14 14:49
# Generated by Django 3.2.4 on 2021-07-
26 11:11
import
django.contrib.sites.managers
import
django.contrib.sites.managers
from
django.db
import
migrations
,
models
from
django.db
import
migrations
,
models
...
@@ -35,8 +35,7 @@ class Migration(migrations.Migration):
...
@@ -35,8 +35,7 @@ class Migration(migrations.Migration):
fields
=
[
fields
=
[
(
'
id
'
,
models
.
BigAutoField
(
auto_created
=
True
,
primary_key
=
True
,
serialize
=
False
,
verbose_name
=
'
ID
'
)),
(
'
id
'
,
models
.
BigAutoField
(
auto_created
=
True
,
primary_key
=
True
,
serialize
=
False
,
verbose_name
=
'
ID
'
)),
(
'
extended_data
'
,
models
.
JSONField
(
default
=
dict
,
editable
=
False
)),
(
'
extended_data
'
,
models
.
JSONField
(
default
=
dict
,
editable
=
False
)),
(
'
first_name
'
,
models
.
CharField
(
max_length
=
255
,
verbose_name
=
'
First name
'
)),
(
'
name
'
,
models
.
CharField
(
max_length
=
255
,
verbose_name
=
'
Name
'
)),
(
'
last_name
'
,
models
.
CharField
(
max_length
=
255
,
verbose_name
=
'
Last name
'
)),
(
'
person
'
,
models
.
ForeignKey
(
blank
=
True
,
null
=
True
,
on_delete
=
django
.
db
.
models
.
deletion
.
SET_NULL
,
related_name
=
'
abi_persons
'
,
to
=
'
core.person
'
,
verbose_name
=
'
AlekSIS person
'
)),
(
'
person
'
,
models
.
ForeignKey
(
blank
=
True
,
null
=
True
,
on_delete
=
django
.
db
.
models
.
deletion
.
SET_NULL
,
related_name
=
'
abi_persons
'
,
to
=
'
core.person
'
,
verbose_name
=
'
AlekSIS person
'
)),
(
'
site
'
,
models
.
ForeignKey
(
default
=
1
,
editable
=
False
,
on_delete
=
django
.
db
.
models
.
deletion
.
CASCADE
,
to
=
'
sites.site
'
)),
(
'
site
'
,
models
.
ForeignKey
(
default
=
1
,
editable
=
False
,
on_delete
=
django
.
db
.
models
.
deletion
.
CASCADE
,
to
=
'
sites.site
'
)),
],
],
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/abi/models.py
+
1
−
2
View file @
8b275ba9
...
@@ -6,8 +6,7 @@ from aleksis.core.models import Person
...
@@ -6,8 +6,7 @@ from aleksis.core.models import Person
class
AbiPerson
(
ExtensibleModel
):
class
AbiPerson
(
ExtensibleModel
):
first_name
=
models
.
CharField
(
max_length
=
255
,
verbose_name
=
_
(
"
First name
"
))
name
=
models
.
CharField
(
max_length
=
255
,
verbose_name
=
_
(
"
Name
"
))
last_name
=
models
.
CharField
(
max_length
=
255
,
verbose_name
=
_
(
"
Last name
"
))
person
=
models
.
ForeignKey
(
person
=
models
.
ForeignKey
(
to
=
Person
,
to
=
Person
,
on_delete
=
models
.
SET_NULL
,
on_delete
=
models
.
SET_NULL
,
...
...
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