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
b7edceac
Commit
b7edceac
authored
5 years ago
by
Nik | Klampfradler
Browse files
Options
Downloads
Plain Diff
Merge branch '206-many-fields-too-short' into 'master'
Resolve "Many fields too short" Closes
#206
See merge request
AlekSIS!202
parents
2c6286d1
6837cefd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!202
Resolve "Many fields too short"
Pipeline
#1177
failed
5 years ago
Stage: test
Stage: build
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/core/migrations/0020_incease_length_of_fields.py
+88
-0
88 additions, 0 deletions
aleksis/core/migrations/0020_incease_length_of_fields.py
aleksis/core/models.py
+13
-13
13 additions, 13 deletions
aleksis/core/models.py
with
101 additions
and
13 deletions
aleksis/core/migrations/0020_incease_length_of_fields.py
0 → 100644
+
88
−
0
View file @
b7edceac
# Generated by Django 3.0.4 on 2020-03-31 12:23
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'
core
'
,
'
0019_drop_import_refs
'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'
group
'
,
name
=
'
name
'
,
field
=
models
.
CharField
(
max_length
=
255
,
unique
=
True
,
verbose_name
=
'
Long name of group
'
),
),
migrations
.
AlterField
(
model_name
=
'
group
'
,
name
=
'
short_name
'
,
field
=
models
.
CharField
(
blank
=
True
,
max_length
=
255
,
null
=
True
,
unique
=
True
,
verbose_name
=
'
Short name of group
'
),
),
migrations
.
AlterField
(
model_name
=
'
notification
'
,
name
=
'
sender
'
,
field
=
models
.
CharField
(
max_length
=
100
,
verbose_name
=
'
Sender
'
),
),
migrations
.
AlterField
(
model_name
=
'
notification
'
,
name
=
'
sent
'
,
field
=
models
.
BooleanField
(
default
=
False
,
verbose_name
=
'
Sent
'
),
),
migrations
.
AlterField
(
model_name
=
'
person
'
,
name
=
'
additional_name
'
,
field
=
models
.
CharField
(
blank
=
True
,
max_length
=
255
,
verbose_name
=
'
Additional name(s)
'
),
),
migrations
.
AlterField
(
model_name
=
'
person
'
,
name
=
'
first_name
'
,
field
=
models
.
CharField
(
max_length
=
255
,
verbose_name
=
'
First name
'
),
),
migrations
.
AlterField
(
model_name
=
'
person
'
,
name
=
'
housenumber
'
,
field
=
models
.
CharField
(
blank
=
True
,
max_length
=
255
,
verbose_name
=
'
Street number
'
),
),
migrations
.
AlterField
(
model_name
=
'
person
'
,
name
=
'
last_name
'
,
field
=
models
.
CharField
(
max_length
=
255
,
verbose_name
=
'
Last name
'
),
),
migrations
.
AlterField
(
model_name
=
'
person
'
,
name
=
'
place
'
,
field
=
models
.
CharField
(
blank
=
True
,
max_length
=
255
,
verbose_name
=
'
Place
'
),
),
migrations
.
AlterField
(
model_name
=
'
person
'
,
name
=
'
postal_code
'
,
field
=
models
.
CharField
(
blank
=
True
,
max_length
=
255
,
verbose_name
=
'
Postal code
'
),
),
migrations
.
AlterField
(
model_name
=
'
person
'
,
name
=
'
short_name
'
,
field
=
models
.
CharField
(
blank
=
True
,
max_length
=
255
,
null
=
True
,
unique
=
True
,
verbose_name
=
'
Short name
'
),
),
migrations
.
AlterField
(
model_name
=
'
person
'
,
name
=
'
street
'
,
field
=
models
.
CharField
(
blank
=
True
,
max_length
=
255
,
verbose_name
=
'
Street
'
),
),
migrations
.
AlterField
(
model_name
=
'
school
'
,
name
=
'
name
'
,
field
=
models
.
CharField
(
max_length
=
255
,
verbose_name
=
'
Name
'
),
),
migrations
.
AlterField
(
model_name
=
'
school
'
,
name
=
'
name_official
'
,
field
=
models
.
CharField
(
help_text
=
'
Official name of the school, e.g. as given by supervisory authority
'
,
max_length
=
255
,
verbose_name
=
'
Official name
'
),
),
migrations
.
AlterField
(
model_name
=
'
schoolterm
'
,
name
=
'
caption
'
,
field
=
models
.
CharField
(
max_length
=
255
,
verbose_name
=
'
Visible caption of the term
'
),
),
]
This diff is collapsed.
Click to expand it.
aleksis/core/models.py
+
13
−
13
View file @
b7edceac
...
...
@@ -28,10 +28,10 @@ class School(ExtensibleModel):
currently logged-in user.
"""
name
=
models
.
CharField
(
verbose_name
=
_
(
"
Name
"
),
max_length
=
30
)
name
=
models
.
CharField
(
verbose_name
=
_
(
"
Name
"
),
max_length
=
255
)
name_official
=
models
.
CharField
(
verbose_name
=
_
(
"
Official name
"
),
max_length
=
2
00
,
max_length
=
2
55
,
help_text
=
_
(
"
Official name of the school, e.g. as given by supervisory authority
"
),
)
...
...
@@ -57,7 +57,7 @@ class SchoolTerm(ExtensibleModel):
be linked to.
"""
caption
=
models
.
CharField
(
verbose_name
=
_
(
"
Visible caption of the term
"
),
max_length
=
30
)
caption
=
models
.
CharField
(
verbose_name
=
_
(
"
Visible caption of the term
"
),
max_length
=
255
)
date_start
=
models
.
DateField
(
verbose_name
=
_
(
"
Effective start date of term
"
),
null
=
True
)
date_end
=
models
.
DateField
(
verbose_name
=
_
(
"
Effective end date of term
"
),
null
=
True
)
...
...
@@ -101,20 +101,20 @@ class Person(ExtensibleModel):
)
is_active
=
models
.
BooleanField
(
verbose_name
=
_
(
"
Is person active?
"
),
default
=
True
)
first_name
=
models
.
CharField
(
verbose_name
=
_
(
"
First name
"
),
max_length
=
30
)
last_name
=
models
.
CharField
(
verbose_name
=
_
(
"
Last name
"
),
max_length
=
30
)
first_name
=
models
.
CharField
(
verbose_name
=
_
(
"
First name
"
),
max_length
=
255
)
last_name
=
models
.
CharField
(
verbose_name
=
_
(
"
Last name
"
),
max_length
=
255
)
additional_name
=
models
.
CharField
(
verbose_name
=
_
(
"
Additional name(s)
"
),
max_length
=
30
,
blank
=
True
verbose_name
=
_
(
"
Additional name(s)
"
),
max_length
=
255
,
blank
=
True
)
short_name
=
models
.
CharField
(
verbose_name
=
_
(
"
Short name
"
),
max_length
=
5
,
blank
=
True
,
null
=
True
,
unique
=
True
verbose_name
=
_
(
"
Short name
"
),
max_length
=
25
5
,
blank
=
True
,
null
=
True
,
unique
=
True
)
street
=
models
.
CharField
(
verbose_name
=
_
(
"
Street
"
),
max_length
=
30
,
blank
=
True
)
housenumber
=
models
.
CharField
(
verbose_name
=
_
(
"
Street number
"
),
max_length
=
10
,
blank
=
True
)
postal_code
=
models
.
CharField
(
verbose_name
=
_
(
"
Postal code
"
),
max_length
=
5
,
blank
=
True
)
place
=
models
.
CharField
(
verbose_name
=
_
(
"
Place
"
),
max_length
=
30
,
blank
=
True
)
street
=
models
.
CharField
(
verbose_name
=
_
(
"
Street
"
),
max_length
=
255
,
blank
=
True
)
housenumber
=
models
.
CharField
(
verbose_name
=
_
(
"
Street number
"
),
max_length
=
255
,
blank
=
True
)
postal_code
=
models
.
CharField
(
verbose_name
=
_
(
"
Postal code
"
),
max_length
=
25
5
,
blank
=
True
)
place
=
models
.
CharField
(
verbose_name
=
_
(
"
Place
"
),
max_length
=
255
,
blank
=
True
)
phone_number
=
PhoneNumberField
(
verbose_name
=
_
(
"
Home phone
"
),
blank
=
True
)
mobile_number
=
PhoneNumberField
(
verbose_name
=
_
(
"
Mobile phone
"
),
blank
=
True
)
...
...
@@ -222,8 +222,8 @@ class Group(ExtensibleModel):
verbose_name
=
_
(
"
Group
"
)
verbose_name_plural
=
_
(
"
Groups
"
)
name
=
models
.
CharField
(
verbose_name
=
_
(
"
Long name of group
"
),
max_length
=
60
,
unique
=
True
)
short_name
=
models
.
CharField
(
verbose_name
=
_
(
"
Short name of group
"
),
max_length
=
30
,
unique
=
True
,
blank
=
True
,
null
=
True
)
name
=
models
.
CharField
(
verbose_name
=
_
(
"
Long name of group
"
),
max_length
=
255
,
unique
=
True
)
short_name
=
models
.
CharField
(
verbose_name
=
_
(
"
Short name of group
"
),
max_length
=
255
,
unique
=
True
,
blank
=
True
,
null
=
True
)
members
=
models
.
ManyToManyField
(
"
Person
"
,
related_name
=
"
member_of
"
,
blank
=
True
)
owners
=
models
.
ManyToManyField
(
"
Person
"
,
related_name
=
"
owner_of
"
,
blank
=
True
)
...
...
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