diff --git a/app/dashboard/migrations/0016_auto_20190313_1358.py b/app/dashboard/migrations/0016_auto_20190313_1358.py deleted file mode 100644 index 909c9d0fda6..00000000000 --- a/app/dashboard/migrations/0016_auto_20190313_1358.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 2.1.7 on 2019-03-13 13:58 - -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', '0015_auto_20190308_1945'), - ] - - 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'), - ), - ] diff --git a/app/dashboard/migrations/0015_auto_20190308_1945.py b/app/dashboard/migrations/0021_auto_20190319_1229.py similarity index 52% rename from app/dashboard/migrations/0015_auto_20190308_1945.py rename to app/dashboard/migrations/0021_auto_20190319_1229.py index 95eae17808c..374602417bb 100644 --- a/app/dashboard/migrations/0015_auto_20190308_1945.py +++ b/app/dashboard/migrations/0021_auto_20190319_1229.py @@ -1,6 +1,5 @@ -# 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 @@ -8,11 +7,16 @@ 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 index f189b9bb7b9..a1fcb06d04b 100644 --- a/app/dashboard/templates/shared/profile_activities_grant.html +++ b/app/dashboard/templates/shared/profile_activities_grant.html @@ -53,11 +53,11 @@ {% endif %} {% if activity.grant.network != 'mainnet' %} -
-

- {{ activity.grant.network }} -

-
+
+

+ {{ activity.grant.network }} +

+
{% endif %} diff --git a/app/retail/templates/shared/activity.html b/app/retail/templates/shared/activity.html index 53ae0452fbb..90dc09a2afc 100644 --- a/app/retail/templates/shared/activity.html +++ b/app/retail/templates/shared/activity.html @@ -104,8 +104,8 @@ {% elif row.metadata.value_in_eth %} {{ row.metadata.value_in_eth }} {{row.token_name}} {% 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 %} {{row.metadata.value_in_token_old}} - {{row.metadata.value_in_token}} {{row.metadata.token_name}} {% endif %}