mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' into hosting_i18n

Browse source
This commit is contained in:
modulos 2017-05-29 14:00:53 +02:00
commit 6937fb98f0
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Changelog
View file

@ -1,2 +1,7 @@
1.0.0: 2017-05-25 1.0.0: 2017-05-25
* Initial stable release * Initial stable release
1.0.1: 2017-05-26
* [datacenterlight] Allow storage to shrink / grow only in 10th of GB
* [datacenterlight] Fix initially shown price
1.0.2: 2017-05-28
* [datacenterlight] Fixed login redirecting to blank page after logout

2
datacenterlight/templates/datacenterlight/index.html
View file

@ -240,7 +240,7 @@
<p>2 GB RAM, </p> <p>2 GB RAM, </p>
</div> </div>
<div class="description"> <div class="description">
<p>{% trans "15 GB Storage (SSD)" %}</p> <p>{% trans "10 GB Storage (SSD)" %}</p>
</div> </div>
</div> </div>
<a href="{% url 'datacenterlight:pricing' %}" class="btn btn-primary">{% trans "Order Now!" %}</a> <a href="{% url 'datacenterlight:pricing' %}" class="btn btn-primary">{% trans "Order Now!" %}</a>

4
hosting/templates/hosting/payment.html
View file

@ -122,10 +122,6 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>

3
utils/views.py
View file

@ -40,6 +40,8 @@ class LoginViewMixin(FormView):
def get_success_url(self): def get_success_url(self):
next_url = self.request.POST.get('next', self.success_url) next_url = self.request.POST.get('next', self.success_url)
if not next_url:
return self.success_url
return next_url return next_url
def form_valid(self, form): def form_valid(self, form):
@ -54,7 +56,6 @@ class LoginViewMixin(FormView):
return HttpResponseRedirect(self.get_success_url()) return HttpResponseRedirect(self.get_success_url())
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
if self.request.user.is_authenticated(): if self.request.user.is_authenticated():
return HttpResponseRedirect(self.get_success_url()) return HttpResponseRedirect(self.get_success_url())