Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scheduling-system
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SMASCH
scheduling-system
Commits
50714faa
Commit
50714faa
authored
6 years ago
by
Piotr Gawron
Browse files
Options
Downloads
Patches
Plain Diff
voucher contains activity_type field
parent
a042a82b
No related branches found
No related tags found
1 merge request
!151
Resolve "voucher should have optional activy type (free text)"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
smash/web/migrations/0117_voucher_activity_type.py
+20
-0
20 additions, 0 deletions
smash/web/migrations/0117_voucher_activity_type.py
smash/web/models/voucher.py
+7
-0
7 additions, 0 deletions
smash/web/models/voucher.py
with
27 additions
and
0 deletions
smash/web/migrations/0117_voucher_activity_type.py
0 → 100644
+
20
−
0
View file @
50714faa
# -*- coding: utf-8 -*-
# Generated by Django 1.10.7 on 2018-07-17 12:54
from
__future__
import
unicode_literals
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'
web
'
,
'
0116_auto_20180611_1346
'
),
]
operations
=
[
migrations
.
AddField
(
model_name
=
'
voucher
'
,
name
=
'
activity_type
'
,
field
=
models
.
CharField
(
blank
=
True
,
default
=
b
''
,
max_length
=
40
,
verbose_name
=
b
'
Activity type
'
),
),
]
This diff is collapsed.
Click to expand it.
smash/web/models/voucher.py
+
7
−
0
View file @
50714faa
...
@@ -48,6 +48,13 @@ class Voucher(models.Model):
...
@@ -48,6 +48,13 @@ class Voucher(models.Model):
default
=
VOUCHER_STATUS_NEW
default
=
VOUCHER_STATUS_NEW
)
)
activity_type
=
models
.
CharField
(
max_length
=
40
,
verbose_name
=
'
Activity type
'
,
null
=
False
,
blank
=
True
,
default
=
''
)
feedback
=
models
.
TextField
(
max_length
=
2000
,
feedback
=
models
.
TextField
(
max_length
=
2000
,
blank
=
True
,
blank
=
True
,
verbose_name
=
'
Feedback
'
verbose_name
=
'
Feedback
'
...
...
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