diff --git a/mhackspace/requests/migrations/0013_auto_20180203_2019.py b/mhackspace/requests/migrations/0013_auto_20180203_2019.py new file mode 100644 index 0000000..18c8cc6 --- /dev/null +++ b/mhackspace/requests/migrations/0013_auto_20180203_2019.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.4 on 2018-02-03 20:19 +from __future__ import unicode_literals + +from django.db import migrations +import martor.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('requests', '0012_auto_20180115_1425'), + ] + + operations = [ + migrations.AlterField( + model_name='userrequest', + name='description', + field=martor.models.MartorField(help_text="detail of what's being requested and where it can be purchased"), + ), + migrations.AlterField( + model_name='userrequestscomment', + name='comment', + field=martor.models.MartorField(help_text='Your comments'), + ), + ] diff --git a/mhackspace/requests/models.py b/mhackspace/requests/models.py index 8f6734f..65e2e3e 100644 --- a/mhackspace/requests/models.py +++ b/mhackspace/requests/models.py @@ -4,6 +4,7 @@ from django.conf import settings from django.db import models from django.urls import reverse from django.utils import timezone +from django.contrib.sites.models import Site from django.db.models.signals import post_save from martor.models import MartorField from mhackspace.base.tasks import matrix_message @@ -53,7 +54,10 @@ class UserRequestsComment(models.Model): def send_topic_update_email(sender, instance, **kwargs): matrix_message.delay( prefix=' - REQUEST', - message='%s - %s' % (instance.title, instance.get_absolute_url())) + message='%s - https://%s%s' % ( + Site.objects.get_current().domain, + instance.title, + instance.get_absolute_url())) post_save.connect(send_topic_update_email, sender=UserRequest) diff --git a/mhackspace/requests/views.py b/mhackspace/requests/views.py index bf8a414..240b7f4 100644 --- a/mhackspace/requests/views.py +++ b/mhackspace/requests/views.py @@ -67,4 +67,5 @@ class RequestsList(LoginRequiredMixin, ListView): def get_context_data(self, *args, **kwargs): context = super(RequestsList, self).get_context_data(*args, **kwargs) context['requests_history'] = UserRequest.objects.filter(acquired=True)[:50] + context['total'] = sum([r.cost for r in UserRequest.objects.filter(acquired=True)]) return context diff --git a/mhackspace/templates/pages/requests.html b/mhackspace/templates/pages/requests.html index 8c03d01..7d92d6c 100644 --- a/mhackspace/templates/pages/requests.html +++ b/mhackspace/templates/pages/requests.html @@ -44,6 +44,7 @@