feat: add data quality view to add species specific urls
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
from django import forms
|
from django import forms
|
||||||
|
|
||||||
from .models import AdoptionNotice, Animal, Image, ReportAdoptionNotice, ReportComment, ModerationAction, User, Species, \
|
from .models import AdoptionNotice, Animal, Image, ReportAdoptionNotice, ReportComment, ModerationAction, User, Species, \
|
||||||
Comment, SexChoicesWithAll, DistanceChoices
|
Comment, SexChoicesWithAll, DistanceChoices, SpeciesSpecificURL
|
||||||
from django_registration.forms import RegistrationForm
|
from django_registration.forms import RegistrationForm
|
||||||
from crispy_forms.helper import FormHelper
|
from crispy_forms.helper import FormHelper
|
||||||
from crispy_forms.layout import Submit, Layout, Fieldset, HTML, Row, Column, Field, Hidden
|
from crispy_forms.layout import Submit, Layout, Fieldset, HTML, Row, Column, Field, Hidden
|
||||||
@@ -111,6 +111,12 @@ class CommentForm(forms.ModelForm):
|
|||||||
fields = ('text',)
|
fields = ('text',)
|
||||||
|
|
||||||
|
|
||||||
|
class SpeciesURLForm(forms.ModelForm):
|
||||||
|
class Meta:
|
||||||
|
model = SpeciesSpecificURL
|
||||||
|
fields = ('species', 'url')
|
||||||
|
|
||||||
|
|
||||||
class ModerationActionForm(forms.ModelForm):
|
class ModerationActionForm(forms.ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = ModerationAction
|
model = ModerationAction
|
||||||
|
@@ -19,6 +19,19 @@
|
|||||||
{{ rescue_org.website|domain }}
|
{{ rescue_org.website|domain }}
|
||||||
</a>
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
{% for species_url in rescue_org.species_urls %}
|
||||||
|
<p>{{ species_url.species }}: <a href="{{ species_url.url }}" target="_blank">{{ species_url.url }}</a></p>
|
||||||
|
{% endfor %}
|
||||||
|
{% if set_species_url_available %}
|
||||||
|
|
||||||
|
<form method="POST">
|
||||||
|
{% csrf_token %}
|
||||||
|
<input type="hidden" name="action" value="set_species_url">
|
||||||
|
<input type="hidden" name="rescue_organization_id" value={{ rescue_org.id }}>
|
||||||
|
{{ species_url_form }}
|
||||||
|
<input type="submit" class="button is-primary" value="{% trans 'Speichern' %}">
|
||||||
|
</form>
|
||||||
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
<div class="card-footer">
|
<div class="card-footer">
|
||||||
<div class="card-footer-item is-paddingless">
|
<div class="card-footer-item is-paddingless">
|
||||||
|
@@ -67,6 +67,7 @@ urlpatterns = [
|
|||||||
path("updatequeue/", views.updatequeue, name="updatequeue"),
|
path("updatequeue/", views.updatequeue, name="updatequeue"),
|
||||||
|
|
||||||
path("organization-check/", views.rescue_organization_check, name="organization-check"),
|
path("organization-check/", views.rescue_organization_check, name="organization-check"),
|
||||||
|
path("organization-check/dq", views.rescue_organization_check_dq, name="organization-check-dq"),
|
||||||
path("modtools/", views.moderation_tools_overview, name="modtools"),
|
path("modtools/", views.moderation_tools_overview, name="modtools"),
|
||||||
|
|
||||||
###########
|
###########
|
||||||
|
@@ -19,9 +19,9 @@ from fellchensammlung import logger
|
|||||||
from .models import AdoptionNotice, Text, Animal, Rule, Image, Report, ModerationAction, \
|
from .models import AdoptionNotice, Text, Animal, Rule, Image, Report, ModerationAction, \
|
||||||
User, Location, AdoptionNoticeStatus, Subscriptions, CommentNotification, BaseNotification, RescueOrganization, \
|
User, Location, AdoptionNoticeStatus, Subscriptions, CommentNotification, BaseNotification, RescueOrganization, \
|
||||||
Species, Log, Timestamp, TrustLevel, SexChoicesWithAll, SearchSubscription, AdoptionNoticeNotification, \
|
Species, Log, Timestamp, TrustLevel, SexChoicesWithAll, SearchSubscription, AdoptionNoticeNotification, \
|
||||||
ImportantLocation
|
ImportantLocation, SpeciesSpecificURL
|
||||||
from .forms import AdoptionNoticeForm, ImageForm, ReportAdoptionNoticeForm, \
|
from .forms import AdoptionNoticeForm, ImageForm, ReportAdoptionNoticeForm, \
|
||||||
CommentForm, ReportCommentForm, AnimalForm, AdoptionNoticeFormAutoAnimal
|
CommentForm, ReportCommentForm, AnimalForm, AdoptionNoticeFormAutoAnimal, SpeciesURLForm
|
||||||
from .models import Language, Announcement
|
from .models import Language, Announcement
|
||||||
from .tools import i18n
|
from .tools import i18n
|
||||||
from .tools.geo import GeoAPI, zoom_level_for_radius
|
from .tools.geo import GeoAPI, zoom_level_for_radius
|
||||||
@@ -702,7 +702,9 @@ def export_own_profile(request):
|
|||||||
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def rescue_organization_check(request):
|
def rescue_organization_check(request, context=None):
|
||||||
|
if context is None:
|
||||||
|
context = {}
|
||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
rescue_org = RescueOrganization.objects.get(id=request.POST.get("rescue_organization_id"))
|
rescue_org = RescueOrganization.objects.get(id=request.POST.get("rescue_organization_id"))
|
||||||
edit_permission = user_is_trust_level_or_above(request.user, TrustLevel.MODERATOR)
|
edit_permission = user_is_trust_level_or_above(request.user, TrustLevel.MODERATOR)
|
||||||
@@ -711,12 +713,30 @@ def rescue_organization_check(request):
|
|||||||
action = request.POST.get("action")
|
action = request.POST.get("action")
|
||||||
if action == "checked":
|
if action == "checked":
|
||||||
rescue_org.set_checked()
|
rescue_org.set_checked()
|
||||||
|
if action == "set_species_url":
|
||||||
|
species_url_form = SpeciesURLForm(request.POST)
|
||||||
|
|
||||||
|
if species_url_form.is_valid():
|
||||||
|
species_url_instance = species_url_form.save(commit=False)
|
||||||
|
species_url_instance.rescues_organization_id = rescue_org.id
|
||||||
|
species_url_instance.save()
|
||||||
|
|
||||||
last_checked_rescue_orgs = RescueOrganization.objects.filter(exclude_from_check=False).order_by("last_checked")
|
last_checked_rescue_orgs = RescueOrganization.objects.filter(exclude_from_check=False).order_by("last_checked")
|
||||||
context = {"rescue_orgs": last_checked_rescue_orgs, }
|
context["rescue_orgs"] = last_checked_rescue_orgs
|
||||||
return render(request, 'fellchensammlung/rescue-organization-check.html', context=context)
|
return render(request, 'fellchensammlung/rescue-organization-check.html', context=context)
|
||||||
|
|
||||||
|
|
||||||
|
@login_required
|
||||||
|
def rescue_organization_check_dq(request):
|
||||||
|
"""
|
||||||
|
Modified view to allow setting species specific urls
|
||||||
|
DQ = data quality
|
||||||
|
"""
|
||||||
|
context = {"set_species_url_available": True,
|
||||||
|
"species_url_form": SpeciesURLForm}
|
||||||
|
return rescue_organization_check(request, context)
|
||||||
|
|
||||||
|
|
||||||
@user_passes_test(user_is_trust_level_or_above)
|
@user_passes_test(user_is_trust_level_or_above)
|
||||||
def moderation_tools_overview(request):
|
def moderation_tools_overview(request):
|
||||||
return render(request, 'fellchensammlung/mod-tool-overview.html')
|
return render(request, 'fellchensammlung/mod-tool-overview.html')
|
||||||
|
Reference in New Issue
Block a user