Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fixes #1542] Increase size of result descriptions and comments #1543

Merged
merged 1 commit into from
May 6, 2015
Merged

[Fixes #1542] Increase size of result descriptions and comments #1543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions akvo/rsr/migrations/0006_auto_20150506_1245.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations
import akvo.rsr.fields


class Migration(migrations.Migration):

dependencies = [
('rsr', '0005_auto_20150423_1429'),
]

operations = [
migrations.AlterField(
model_name='indicator',
name='baseline_comment',
field=akvo.rsr.fields.ValidXMLCharField(help_text='You can further define the baseline here. (2000 characters)', max_length=2000, verbose_name='baseline comment', blank=True),
preserve_default=True,
),
migrations.AlterField(
model_name='indicator',
name='description',
field=akvo.rsr.fields.ValidXMLCharField(help_text='You can further define the indicator here. (2000 characters)', max_length=2000, verbose_name='description', blank=True),
preserve_default=True,
),
migrations.AlterField(
model_name='indicatorperiod',
name='actual_comment',
field=akvo.rsr.fields.ValidXMLCharField(help_text='You can comment on the actual value here. (2000 characters)', max_length=2000, verbose_name='actual comment', blank=True),
preserve_default=True,
),
migrations.AlterField(
model_name='indicatorperiod',
name='target_comment',
field=akvo.rsr.fields.ValidXMLCharField(help_text='You can comment on the target value here. (2000 characters)', max_length=2000, verbose_name='target comment', blank=True),
preserve_default=True,
),
migrations.AlterField(
model_name='result',
name='description',
field=akvo.rsr.fields.ValidXMLCharField(help_text='You can provide further information of the result here. (2000 characters)', max_length=2000, verbose_name='description', blank=True),
preserve_default=True,
),
]
16 changes: 8 additions & 8 deletions akvo/rsr/models/indicator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class Indicator(models.Model):
help_text=_(u'Is the aim of the project to increase or decrease the value of the '
u'indicator?'))
description = ValidXMLCharField(
_(u'description'), blank=True, max_length=255,
help_text=_(u'You can further define the indicator here. (255 characters)')
_(u'description'), blank=True, max_length=2000,
help_text=_(u'You can further define the indicator here. (2000 characters)')
)
baseline_year = models.PositiveIntegerField(
_(u'baseline year'), blank=True, null=True, max_length=4,
Expand All @@ -41,8 +41,8 @@ class Indicator(models.Model):
help_text=_(u'Enter the value of the baseline indicator. (50 characters)')
)
baseline_comment = ValidXMLCharField(
_(u'baseline comment'), blank=True, max_length=255,
help_text=_(u'You can further define the baseline here. (255 characters)')
_(u'baseline comment'), blank=True, max_length=2000,
help_text=_(u'You can further define the baseline here. (2000 characters)')
)

def __unicode__(self):
Expand Down Expand Up @@ -73,17 +73,17 @@ class IndicatorPeriod(models.Model):
u'(50 characters)')
)
target_comment = ValidXMLCharField(
_(u'target comment'), blank=True, max_length=255,
help_text=_(u'You can comment on the target value here. (255 characters)')
_(u'target comment'), blank=True, max_length=2000,
help_text=_(u'You can comment on the target value here. (2000 characters)')
)
actual_value = ValidXMLCharField(
_(u'actual value'), blank=True, max_length=50,
help_text=_(u'Enter the value of the indicator that the project has reached. '
u'(50 characters)')
)
actual_comment = ValidXMLCharField(
_(u'actual comment'), blank=True, max_length=255,
help_text=_(u'You can comment on the actual value here. (255 characters)')
_(u'actual comment'), blank=True, max_length=2000,
help_text=_(u'You can comment on the actual value here. (2000 characters)')
)

def __unicode__(self):
Expand Down
4 changes: 2 additions & 2 deletions akvo/rsr/models/result.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ class Result(models.Model):
)
aggregation_status = models.NullBooleanField(_(u'aggregation status'), blank=True)
description = ValidXMLCharField(
_(u'description'), blank=True, max_length=255,
help_text=_(u'You can provide further information of the result here. (255 characters)')
_(u'description'), blank=True, max_length=2000,
help_text=_(u'You can provide further information of the result here. (2000 characters)')
)

def __unicode__(self):
Expand Down