From 57c3ef19fd5da8c750eb0e69671c1bba143c41c0 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Sun, 26 Aug 2018 20:23:10 +0200
Subject: [PATCH] Bug fixes to fellowship mifgrations.
---
.../funds/management/commands/migrate_fellowship_application.py | 1 -
.../funds/management/commands/migrate_fellowship_proposals.py | 1 -
opentech/apply/funds/management/commands/migration_base.py | 2 +-
opentech/apply/funds/management/commands/seed_fellowship.py | 2 ++
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opentech/apply/funds/management/commands/migrate_fellowship_application.py b/opentech/apply/funds/management/commands/migrate_fellowship_application.py
index 119dfec46..5e33d7fd0 100644
--- a/opentech/apply/funds/management/commands/migrate_fellowship_application.py
+++ b/opentech/apply/funds/management/commands/migrate_fellowship_application.py
@@ -15,7 +15,6 @@ class Command(MigrateCommand):
"field_application_name": {
"id": "full_name",
"type": "value",
- # If no Drupal value key is specified, we default to 'value'
"key": "safe_value",
},
"field_application_mail": {
diff --git a/opentech/apply/funds/management/commands/migrate_fellowship_proposals.py b/opentech/apply/funds/management/commands/migrate_fellowship_proposals.py
index 7b46c1502..e9b319872 100644
--- a/opentech/apply/funds/management/commands/migrate_fellowship_proposals.py
+++ b/opentech/apply/funds/management/commands/migrate_fellowship_proposals.py
@@ -15,7 +15,6 @@ class Command(MigrateCommand):
"field_proposal_common_name": {
"id": "full_name",
"type": "value",
- # If no Drupal value key is specified, we default to 'value'
"key": "safe_value",
},
diff --git a/opentech/apply/funds/management/commands/migration_base.py b/opentech/apply/funds/management/commands/migration_base.py
index 76e21b981..3e90de2c1 100644
--- a/opentech/apply/funds/management/commands/migration_base.py
+++ b/opentech/apply/funds/management/commands/migration_base.py
@@ -101,7 +101,7 @@ class MigrateCommand(BaseCommand):
if "value" not in form_data:
form_data["value"] = 0
- if not form_data["duration"]:
+ if "duration" not in form_data or not form_data["duration"]:
form_data["duration"] = "1"
submission.form_data = form_data
diff --git a/opentech/apply/funds/management/commands/seed_fellowship.py b/opentech/apply/funds/management/commands/seed_fellowship.py
index 6b84f43a3..5fdc615c3 100644
--- a/opentech/apply/funds/management/commands/seed_fellowship.py
+++ b/opentech/apply/funds/management/commands/seed_fellowship.py
@@ -94,6 +94,8 @@ class Command(BaseCommand):
data2 = [
{"type": "text_markup", "value": "<h3>Proposal information</h3>", "id": ""},
{"type": "title", "value": {"field_label": "Proposal title", "help_text": "", "info": None}, "id": ""},
+ {"type": "full_name", "value": {"field_label": "Your name", "help_text": "", "info": None}, "id": "c0c75948-b3c3-42be-8646-bc2a5d8521c3"},
+ {"type": "email", "value": {"field_label": "E-mail", "help_text": "", "info": None}, "id": "a607ec56-da2a-46d4-b0c9-7c8f3c351a6e"},
{"type": "value", "value": {"field_label": "If you are applying for direct funding, how much do you need?", "help_text": "Amount requested should be less than 50000 USD.", "info": None}, "id": "cfae89dc-f327-45f4-80e9-f267c3bd1ec7"},
{"type": "duration", "value": {"field_label": "How long do you want to work on this fellowship?", "help_text": "", "info": None}, "id": "08b9b5c3-e01d-41ac-95be-600a4fee7d87"},
{"type": "char", "value": {"field_label": "Host organisation", "help_text": "", "required": "", "format": "", "default_value": ""}, "id": "bc03235e-3c78-4770-9fc2-97feb93c2c8c"},
--
GitLab