From 5e3f9c6ca57e3223d6f23eec9873d72a4606b5ef Mon Sep 17 00:00:00 2001
From: sandeepsajan0 <sandeepsajan0@gmail.com>
Date: Tue, 9 Aug 2022 10:35:37 +0530
Subject: [PATCH] Resolve migration conflicts
---
...ter_project_status_add_pafreviewersrole.py} | 9 +++++++--
.../0055_project_paf_reviews_meta_data.py | 18 ------------------
2 files changed, 7 insertions(+), 20 deletions(-)
rename hypha/apply/projects/migrations/{0054_paf_reviewers_roles__alter_project_status.py => 0055_alter_project_status_add_pafreviewersrole.py} (78%)
delete mode 100644 hypha/apply/projects/migrations/0055_project_paf_reviews_meta_data.py
diff --git a/hypha/apply/projects/migrations/0054_paf_reviewers_roles__alter_project_status.py b/hypha/apply/projects/migrations/0055_alter_project_status_add_pafreviewersrole.py
similarity index 78%
rename from hypha/apply/projects/migrations/0054_paf_reviewers_roles__alter_project_status.py
rename to hypha/apply/projects/migrations/0055_alter_project_status_add_pafreviewersrole.py
index 25a8392ee..83d1dc25a 100644
--- a/hypha/apply/projects/migrations/0054_paf_reviewers_roles__alter_project_status.py
+++ b/hypha/apply/projects/migrations/0055_alter_project_status_add_pafreviewersrole.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.13 on 2022-07-14 12:46
+# Generated by Django 3.2.14 on 2022-08-09 04:59
from django.db import migrations, models
import django.db.models.deletion
@@ -8,10 +8,15 @@ import modelcluster.fields
class Migration(migrations.Migration):
dependencies = [
- ('application_projects', '0053_projectapprovalform'),
+ ('application_projects', '0054_alter_project_form_fields'),
]
operations = [
+ migrations.AddField(
+ model_name='project',
+ name='paf_reviews_meta_data',
+ field=models.JSONField(default=dict, help_text='Reviewers role and their actions/comments'),
+ ),
migrations.AlterField(
model_name='project',
name='status',
diff --git a/hypha/apply/projects/migrations/0055_project_paf_reviews_meta_data.py b/hypha/apply/projects/migrations/0055_project_paf_reviews_meta_data.py
deleted file mode 100644
index a674f2a6a..000000000
--- a/hypha/apply/projects/migrations/0055_project_paf_reviews_meta_data.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 3.2.13 on 2022-07-18 13:27
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
- dependencies = [
- ('application_projects', '0054_paf_reviewers_roles__alter_project_status'),
- ]
-
- operations = [
- migrations.AddField(
- model_name='project',
- name='paf_reviews_meta_data',
- field=models.JSONField(default=dict, help_text='Reviewers role and their actions/comments'),
- ),
- ]
--
GitLab