Merge commit 'c5f6355f193df939ebb1b158be6b4dc2ba425a60' into develop

django_lostplaces/lostplaces/views/explorer_views.py

@@ -7,11 +7,13 @@ from django.utils.translation import ugettext_lazy as _
 
 from django.shortcuts import render, redirect, get_object_or_404
 from django.urls import reverse_lazy
+from django.contrib import messages
 
 from lostplaces.common import get_all_subclasses
 from lostplaces.views.base_views import IsAuthenticatedMixin
 from lostplaces.models.models import Explorer
 from lostplaces.models.place import Place, PlaceAsset
+from lostplaces.forms import ExplorerChangeForm, ExplorerUserChangeForm
 
 class ExplorerProfileView(IsAuthenticatedMixin, View):
     def get(self, request, explorer_id):
@@ -33,13 +35,53 @@ class ExplorerProfileView(IsAuthenticatedMixin, View):
             asset_count += objects.count()
         
         context['asset_count'] = asset_count
-        
-        print(context['assets'])
-        
+                
         return render(
             request=request,
             template_name='explorer/profile.html',
             context=context
         )
-        
-        
+
+class ExplorerProfileUpdateView(IsAuthenticatedMixin, View):
+    success_message = ''
+    permission_denied_message = ''
+
+    def get(self, request, *args, **kwargs):
+        context = {
+            'explorer_user_change_form': ExplorerUserChangeForm(instance=request.user),
+            'explorer_change_form': ExplorerChangeForm(instance=request.user.explorer)
+        }
+        if request.user.explorer.profile_image:
+            context['explorer_image'] = request.user.explorer.profile_image
+        return render(request, 'explorer/profile_update.html', context)
+
+    def post(self, request, *args, **kwargs):
+        print(request.POST)
+        explorer_user_change_form = ExplorerUserChangeForm(
+            request.POST,
+            instance=request.user
+            )
+        explorer_change_form = ExplorerChangeForm(
+            request.POST,
+            request.FILES,
+            instance=request.user.explorer
+        )
+
+        if explorer_change_form.is_valid() and explorer_user_change_form.is_valid():
+            explorer_user_change_form.save()
+            explorer_change_form.save()
+
+            print(explorer_change_form.cleaned_data)
+
+            messages.success(
+                self.request,
+                _('Successfully updated Explorer profile')
+            )
+        else:
+            # Usually the browser should have checked the form before sending.
+            messages.error(
+                self.request,
+                _('Please fill in all required fields.')
+            )
+        return redirect(reverse_lazy('explorer_profile_update'))
+    

django_lostplaces/lostplaces/views/place_views.py

@@ -145,5 +145,5 @@ class PlaceUnfavoriteView(IsAuthenticatedMixin, View):
         if request.user is not None:
             request.user.explorer.favorite_places.remove(place)
             request.user.explorer.save()
-            
-        return redirect_referer_or(request, reverse('place_detail', kwargs={'pk': place.pk}))                    
+
+        return redirect_referer_or(request, reverse('place_detail', kwargs={'pk': place.pk}))                    

django_lostplaces/lostplaces/views/views.py

@@ -11,7 +11,7 @@ from django.shortcuts import render, redirect, get_object_or_404
 from django.http import HttpResponseForbidden
 from django.utils.translation import ugettext_lazy as _
 
-from lostplaces.forms import ExplorerCreationForm, TagSubmitForm
+from lostplaces.forms import SignupVoucherForm, TagSubmitForm
 from lostplaces.models import Place, PhotoAlbum
 from lostplaces.views.base_views import IsAuthenticatedMixin
 from lostplaces.common import redirect_referer_or
@@ -24,7 +24,7 @@ from lostplaces.views.base_views import (
 from taggit.models import Tag
 
 class SignUpView(SuccessMessageMixin, CreateView):
-    form_class = ExplorerCreationForm
+    form_class = SignupVoucherForm
     success_url = reverse_lazy('login')
     template_name = 'signup.html'
     success_message = _('User created')