Changes requested by @thelostone-mc (gitcoinco#3316)

* Solve migration conflicts * Fix indentation flaws
e18r · Mar 19, 2019 · 3428359 · 3428359
1 parent d92d575
commit 3428359
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 32 deletions.
diff --git a/app/dashboard/migrations/0016_auto_20190313_1358.py b/app/dashboard/migrations/0016_auto_20190313_1358.py
diff --git a/...ard/migrations/0015_auto_20190308_1945.py → ...ard/migrations/0021_auto_20190319_1229.py b/...ard/migrations/0015_auto_20190308_1945.py → ...ard/migrations/0021_auto_20190319_1229.py
@@ -1,18 +1,22 @@
-# Generated by Django 2.1.7 on 2019-03-08 19:45
+# Generated by Django 2.1.7 on 2019-03-19 12:29
 
-import django.contrib.postgres.fields.jsonb
 from django.db import migrations, models
 import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('grants', '0015_merge_20190225_1422'),
-        ('dashboard', '0014_merge_20190221_2246'),
+        ('grants', '0017_matchpledge_end_date'),
+        ('dashboard', '0020_auto_20190312_0739'),
     ]
 
     operations = [
+        migrations.AddField(
+            model_name='activity',
+            name='grant',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='grants.Grant'),
+        ),
         migrations.AddField(
             model_name='activity',
             name='subscription',

diff --git a/app/dashboard/templates/shared/profile_activities_grant.html b/app/dashboard/templates/shared/profile_activities_grant.html
@@ -53,11 +53,11 @@
       </div>
     {% endif %}
     {% if activity.grant.network != 'mainnet' %}
-    <div class="tag network_warning">
-      <p>
-        <span>{{ activity.grant.network }}</span>
-      </p>
-    </div>
+      <div class="tag network_warning">
+        <p>
+          <span>{{ activity.grant.network }}</span>
+        </p>
+      </div>
     {% endif %}
   </div>
 </a>
diff --git a/app/retail/templates/shared/activity.html b/app/retail/templates/shared/activity.html
@@ -104,8 +104,8 @@
             {% elif row.metadata.value_in_eth %}
             <span>{{ row.metadata.value_in_eth }} {{row.token_name}}</span>
             {% elif row.grant %}
-            {{ row.metadata.value_in_token | floatformat:2 }} / {{ row.metadata.amount_goal | floatformat:2 }}
-            {{ row.metadata.token_name }}
+              {{ row.metadata.value_in_token | floatformat:2 }} / {{ row.metadata.amount_goal | floatformat:2 }}
+              {{ row.metadata.token_name }}
             {% else %}
             <span>{{row.metadata.value_in_token_old}}  - {{row.metadata.value_in_token}}  {{row.metadata.token_name}}</span>
             {% endif %}