show link to report dashboard if user has reported something
This commit is contained in:
parent
2a4f841070
commit
698aef7100
4 changed files with 55 additions and 3 deletions
29
src/c3nav/mapdata/migrations/0079_auto_20191224_1858.py
Normal file
29
src/c3nav/mapdata/migrations/0079_auto_20191224_1858.py
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
# Generated by Django 2.2.8 on 2019-12-24 17:58
|
||||||
|
|
||||||
|
from django.conf import settings
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('mapdata', '0078_reports'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name='report',
|
||||||
|
options={'default_related_name': 'reports', 'verbose_name': 'Report', 'verbose_name_plural': 'Reports'},
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='report',
|
||||||
|
name='author',
|
||||||
|
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='reports', to=settings.AUTH_USER_MODEL, verbose_name='author'),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='report',
|
||||||
|
name='created_groups',
|
||||||
|
field=models.ManyToManyField(blank=True, help_text='select all groups that apply, if any', limit_choices_to={'can_report_missing': True}, related_name='reports', to='mapdata.LocationGroup', verbose_name='location groups'),
|
||||||
|
),
|
||||||
|
]
|
|
@ -2,6 +2,7 @@ import string
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib.auth import get_user_model
|
from django.contrib.auth import get_user_model
|
||||||
|
from django.core.cache import cache
|
||||||
from django.core.exceptions import ObjectDoesNotExist
|
from django.core.exceptions import ObjectDoesNotExist
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
|
@ -90,7 +91,7 @@ class Report(models.Model):
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = _('Report')
|
verbose_name = _('Report')
|
||||||
verbose_name_plural = _('Reports')
|
verbose_name_plural = _('Reports')
|
||||||
default_related_name = 'report'
|
default_related_name = 'reports'
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def form_cls(self):
|
def form_cls(self):
|
||||||
|
@ -137,8 +138,20 @@ class Report(models.Model):
|
||||||
description=self.description,
|
description=self.description,
|
||||||
reviewers=reviewers)
|
reviewers=reviewers)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def user_has_reports(cls, user):
|
||||||
|
if not user.is_authenticated:
|
||||||
|
return False
|
||||||
|
result = cache.get('user:has-reports:%d' % user.pk, None)
|
||||||
|
if result is None:
|
||||||
|
result = user.reports.exists()
|
||||||
|
cache.set('user:has-reports:%d' % user.pk, result, 900)
|
||||||
|
return result
|
||||||
|
|
||||||
def save(self, *args, **kwargs):
|
def save(self, *args, **kwargs):
|
||||||
created = self.pk is None
|
created = self.pk is None
|
||||||
|
if self.author:
|
||||||
|
cache.delete('user:has-reports:%d' % self.author.pk)
|
||||||
super().save(*args, **kwargs)
|
super().save(*args, **kwargs)
|
||||||
if created:
|
if created:
|
||||||
self.notify_reviewers()
|
self.notify_reviewers()
|
||||||
|
|
|
@ -29,7 +29,15 @@
|
||||||
{% trans 'You can review reports' %}
|
{% trans 'You can review reports' %}
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
<a class="button" href="{% url 'site.report_list' %}">{% trans 'Show reports' %}</a>
|
<a class="button" href="{% url 'site.report_list' filter='open' %}">{% trans 'Show reports' %}</a>
|
||||||
|
</p>
|
||||||
|
{% elif user_has_reports %}
|
||||||
|
<hr>
|
||||||
|
<p>
|
||||||
|
{% trans 'You have submitted reports.' %}
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<a class="button" href="{% url 'site.report_list' filter='all' %}">{% trans 'Show your reports' %}</a>
|
||||||
</p>
|
</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
|
@ -303,7 +303,9 @@ def change_password_view(request):
|
||||||
@never_cache
|
@never_cache
|
||||||
@login_required(login_url='site.login')
|
@login_required(login_url='site.login')
|
||||||
def account_view(request):
|
def account_view(request):
|
||||||
return render(request, 'site/account.html', {})
|
return render(request, 'site/account.html', {
|
||||||
|
'user_has_reports': Report.user_has_reports(request.user),
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
@never_cache
|
@never_cache
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue