Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Rex Dri
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
32
Issues
32
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Rex Dri
Rex Dri
Commits
c4fb7e40
Commit
c4fb7e40
authored
Aug 20, 2018
by
Florent Chehab
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Scholarship model update with currency
parent
8009e70d
Pipeline
#26318
passed with stages
in 1 minute and 25 seconds
Changes
8
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
70 additions
and
5 deletions
+70
-5
rex/admin.py
rex/admin.py
+2
-1
rex/migrations/0004_auto_20180820_1700.py
rex/migrations/0004_auto_20180820_1700.py
+19
-0
rex/migrations/0005_auto_20180820_1702.py
rex/migrations/0005_auto_20180820_1702.py
+24
-0
rex/migrations/0006_auto_20180820_1715.py
rex/migrations/0006_auto_20180820_1715.py
+19
-0
rex/models/module/basicModule.py
rex/models/module/basicModule.py
+2
-2
rex/models/module/scholarship.py
rex/models/module/scholarship.py
+2
-1
rex/models/tools/usefullLinksField.py
rex/models/tools/usefullLinksField.py
+1
-0
rex/models/university/universityScholarship.py
rex/models/university/universityScholarship.py
+1
-1
No files found.
rex/admin.py
View file @
c4fb7e40
from
django.contrib
import
admin
from
reversion_compare.admin
import
CompareVersionAdmin
from
rex.models.university
import
University
,
Campus
from
rex.models.university
import
University
,
Campus
,
UniversityScholarship
from
rex.models.location
import
Country
,
City
...
...
@@ -10,3 +10,4 @@ admin.site.register(City)
admin
.
site
.
register
(
University
,
CompareVersionAdmin
)
admin
.
site
.
register
(
Campus
,
CompareVersionAdmin
)
admin
.
site
.
register
(
UniversityScholarship
,
CompareVersionAdmin
)
rex/migrations/0004_auto_20180820_1700.py
0 → 100644
View file @
c4fb7e40
# Generated by Django 2.0.3 on 2018-08-20 15:00
from
django.db
import
migrations
,
models
import
django.db.models.deletion
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'rex'
,
'0003_currency'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'universityscholarship'
,
name
=
'currency'
,
field
=
models
.
ForeignKey
(
on_delete
=
django
.
db
.
models
.
deletion
.
PROTECT
,
to
=
'rex.Currency'
),
),
]
rex/migrations/0005_auto_20180820_1702.py
0 → 100644
View file @
c4fb7e40
# Generated by Django 2.0.3 on 2018-08-20 15:02
from
django.db
import
migrations
,
models
import
rex.models.tools.usefullLinksField
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'rex'
,
'0004_auto_20180820_1700'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'universityscholarship'
,
name
=
'comment'
,
field
=
models
.
TextField
(
blank
=
True
),
),
migrations
.
AlterField
(
model_name
=
'universityscholarship'
,
name
=
'usefull_links'
,
field
=
rex
.
models
.
tools
.
usefullLinksField
.
UsefullLinksField
(
null
=
True
,
validators
=
[
rex
.
models
.
tools
.
usefullLinksField
.
validate_usefull_links
]),
),
]
rex/migrations/0006_auto_20180820_1715.py
0 → 100644
View file @
c4fb7e40
# Generated by Django 2.0.3 on 2018-08-20 15:15
from
django.db
import
migrations
import
rex.models.tools.usefullLinksField
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'rex'
,
'0005_auto_20180820_1702'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'universityscholarship'
,
name
=
'usefull_links'
,
field
=
rex
.
models
.
tools
.
usefullLinksField
.
UsefullLinksField
(
blank
=
True
,
default
=
[],
validators
=
[
rex
.
models
.
tools
.
usefullLinksField
.
validate_usefull_links
]),
),
]
rex/models/module/basicModule.py
View file @
c4fb7e40
...
...
@@ -5,8 +5,8 @@ from rex.models.module import Module
class
BasicModule
(
Module
):
comment
=
models
.
TextField
()
usefull_links
=
UsefullLinksField
()
comment
=
models
.
TextField
(
blank
=
True
)
usefull_links
=
UsefullLinksField
(
blank
=
True
)
class
Meta
:
abstract
=
True
rex/models/module/scholarship.py
View file @
c4fb7e40
from
django.db
import
models
from
rex.models.module
import
BasicModule
from
rex.models.module.currency
import
Currency
from
django.core.exceptions
import
ValidationError
from
django.core.validators
import
MinValueValidator
...
...
@@ -7,7 +8,7 @@ from django.core.validators import MinValueValidator
class
Scholarship
(
BasicModule
):
type
=
models
.
CharField
(
max_length
=
200
)
currency
=
models
.
CharField
(
max_length
=
50
)
currency
=
models
.
ForeignKey
(
Currency
,
on_delete
=
models
.
PROTECT
)
amount_min
=
models
.
DecimalField
(
max_digits
=
20
,
decimal_places
=
2
,
...
...
rex/models/tools/usefullLinksField.py
View file @
c4fb7e40
...
...
@@ -32,4 +32,5 @@ class UsefullLinksField(JSONField):
def
__init__
(
self
,
*
args
,
**
kwargs
):
kwargs
[
'validators'
]
=
[
validate_usefull_links
]
kwargs
[
'default'
]
=
[]
super
(
UsefullLinksField
,
self
).
__init__
(
*
args
,
**
kwargs
)
rex/models/university/universityScholarship.py
View file @
c4fb7e40
...
...
@@ -24,7 +24,7 @@ class UniversityScholarshipSerializer(serializers.ModelSerializer):
class
Meta
:
model
=
UniversityScholarship
fields
=
(
'university'
,
'modified_by'
,
'modified_date'
,
fields
=
(
'university'
,
'modified_by'
,
'modified_date'
,
'comment'
,
'usefull_links'
,
'type'
,
'currency'
,
'amount_min'
,
'amount_max'
,
'id'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment