From debf9ff6ef8ec5bd49869e2db123fca2b75d4978 Mon Sep 17 00:00:00 2001 From: Aurlus Wedava Date: Mon, 8 Apr 2019 13:41:31 +0300 Subject: [PATCH 1/2] TOLA-453: changing default naming for workflow levels --- workflow/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow/models.py b/workflow/models.py index 135d78ffa..dac92fa40 100755 --- a/workflow/models.py +++ b/workflow/models.py @@ -119,9 +119,9 @@ class Organization(models.Model): organization_url = models.CharField(blank=True, null=True, max_length=255) sector = models.ManyToManyField(Sector, blank=True, related_name="org_sector") level_1_label = models.CharField("Project/Program Organization Level 1 label", default="Program", max_length=255, blank=True) - level_2_label = models.CharField("Project/Program Organization Level 2 label", default="Project", max_length=255, blank=True) - level_3_label = models.CharField("Project/Program Organization Level 3 label", default="Component", max_length=255, blank=True) - level_4_label = models.CharField("Project/Program Organization Level 4 label", default="Activity", max_length=255, blank=True) + level_2_label = models.CharField("Project/Program Organization Level 2 label", default="Activity", max_length=255, blank=True) + level_3_label = models.CharField("Project/Program Organization Level 3 label", default="Task", max_length=255, blank=True) + level_4_label = models.CharField("Project/Program Organization Level 4 label", default="Component", max_length=255, blank=True) create_date = models.DateTimeField(null=True, blank=True) edit_date = models.DateTimeField(null=True, blank=True) chargebee_subscription_id = models.CharField(blank=True, null=True, max_length=50) From 337af19174ad5423cb675526ba4f56e832460c77 Mon Sep 17 00:00:00 2001 From: Aurlus Wedava Date: Tue, 9 Apr 2019 16:33:02 +0300 Subject: [PATCH 2/2] TOLA-543: migration for the default workflow names --- .../migrations/0041_auto_20190409_0632.py | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 workflow/migrations/0041_auto_20190409_0632.py diff --git a/workflow/migrations/0041_auto_20190409_0632.py b/workflow/migrations/0041_auto_20190409_0632.py new file mode 100644 index 000000000..40601a959 --- /dev/null +++ b/workflow/migrations/0041_auto_20190409_0632.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.17 on 2019-04-09 13:32 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('workflow', '0040_merge_20190312_0047'), + ] + + operations = [ + migrations.AlterField( + model_name='organization', + name='level_2_label', + field=models.CharField(blank=True, default='Activity', max_length=255, verbose_name='Project/Program Organization Level 2 label'), + ), + migrations.AlterField( + model_name='organization', + name='level_3_label', + field=models.CharField(blank=True, default='Task', max_length=255, verbose_name='Project/Program Organization Level 3 label'), + ), + migrations.AlterField( + model_name='organization', + name='level_4_label', + field=models.CharField(blank=True, default='Component', max_length=255, verbose_name='Project/Program Organization Level 4 label'), + ), + ]