Merge branch 'feature/unauth_content'

This commit is contained in:
2020-09-10 00:35:08 +02:00
31 changed files with 1617 additions and 141 deletions

View File

@@ -106,4 +106,4 @@ class PlaceAssetDeleteView(IsAuthenticated, IsPlaceSubmitter, SingleObjectMixin,
place_id = self.get_object().place.id
self.get_object().delete()
messages.success(self.request, self.success_message)
return redirect(reverse_lazy('place_detail', kwargs={'pk': place_id}))
return redirect(reverse_lazy('place_detail', kwargs={'pk': place_id}))

View File

@@ -4,7 +4,7 @@ from django.views.generic.edit import CreateView
from django.contrib.messages.views import SuccessMessageMixin
from django.contrib import messages
from django.urls import reverse_lazy
from django.shortcuts import render, redirect
from django.shortcuts import render, redirect, get_object_or_404
from django.http import HttpResponseForbidden
from lostplaces_app.forms import ExplorerCreationForm, TagSubmitForm
@@ -24,7 +24,7 @@ class SignUpView(SuccessMessageMixin, CreateView):
template_name = 'signup.html'
success_message = 'User created.'
class HomeView(View):
class HomeView(IsAuthenticated, View):
def get(self, request, *args, **kwargs):
place_list = Place.objects.all().order_by('-submitted_when')[:10]
place_map_center = Place.average_latlon(place_list)
@@ -34,6 +34,13 @@ class HomeView(View):
}
return render(request, 'home.html', context)
def handle_no_permission(self):
place_list = Place.objects.all().order_by('-submitted_when')[:5]
context = {
'place_list': place_list
}
return render(self.request, 'home_unauth.html', context)
class PhotoAlbumCreateView(PlaceAssetCreateView):
model = PhotoAlbum
fields = ['url', 'label']
@@ -66,4 +73,7 @@ class PlaceTagDeleteView(IsAuthenticated, View):
place = Place.objects.get(pk=tagged_id)
tag = Tag.objects.get(pk=tag_id)
place.tags.remove(tag)
return redirect(reverse_lazy('place_detail', kwargs={'pk': tagged_id}))
return redirect(reverse_lazy('place_detail', kwargs={'pk': tagged_id}))
def FlatView(request, slug):
return render(request, 'flat/' + slug + '.html')