Compare commits

..

No commits in common. "a8928587f2698ee20e6c2be3a024e988b5368397" and "21fb9a4a8d07846134f2293f902c51a56da6c261" have entirely different histories.

6 changed files with 3 additions and 15 deletions

View File

@ -1,12 +1,6 @@
Changelog Changelog
========= =========
0.8.3
-----
* Fix password change views
* Show errors on delete view
0.8.2 0.8.2
----- -----

View File

@ -34,7 +34,6 @@ class GASLoginView(LoginView):
class GASPasswordChangeView(GASMixin, PasswordChangeView): class GASPasswordChangeView(GASMixin, PasswordChangeView):
template_name = 'gas/base_form.html' template_name = 'gas/base_form.html'
success_url = reverse_lazy('gas:index') success_url = reverse_lazy('gas:index')
continue_url = reverse_lazy('gas:change_password')
title = _('Change your password') title = _('Change your password')
success_message = _('Password changed.') success_message = _('Password changed.')

View File

@ -75,9 +75,6 @@ class ChangePasswordUser(BaseMixin, gviews.GASMixin, FormView):
def get_title(self): def get_title(self):
return _('Change {username} user password').format(username=self.user.username) return _('Change {username} user password').format(username=self.user.username)
def get_continue_url(self):
return reverse('gas:user_change_password', args=(self.kwargs['pk'],))
def get_form_kwargs(self): def get_form_kwargs(self):
kwargs = super().get_form_kwargs() kwargs = super().get_form_kwargs()
kwargs['user'] = self.user kwargs['user'] = self.user

View File

@ -23,10 +23,10 @@
<li><a href="{{ view.get_cancel_url }}">{% trans "Cancel" %}</a></li> <li><a href="{{ view.get_cancel_url }}">{% trans "Cancel" %}</a></li>
{% endif %} {% endif %}
<li><button type="submit">{% trans "Save" %}</button></li> <li><button type="submit">{% trans "Save" %}</button>
{% if not is_popup %} {% if not is_popup %}
<li><button name="save_and_continue" type="submit">{% trans "Save and continue" %}</button></li> <li><button name="save_and_continue" type="submit">{% trans "Save and continue" %}</button>
{% endif %} {% endif %}
{% block extra_form_actions %}{% endblock %} {% block extra_form_actions %}{% endblock %}
{% endblock form_actions %} {% endblock form_actions %}

View File

@ -1,12 +1,10 @@
{% extends base_template %} {% extends base_template %}
{% load i18n %} {% load i18n %}
{% load form_tags %}
{% block ui_title %}{% trans "Delete confirmation" %}{% endblock %} {% block ui_title %}{% trans "Delete confirmation" %}{% endblock %}
{% block content %} {% block content %}
{% form_errors form %}
<p>{{ confirmation_text }}</p> <p>{{ confirmation_text }}</p>
{% if show_deleted_objects %} {% if show_deleted_objects %}

View File

@ -1,6 +1,6 @@
[metadata] [metadata]
name = django-gas name = django-gas
version = 0.8.3 version = 0.8.2
description = An alternative to django admin description = An alternative to django admin
long_description = file: readme.md, changelog.md, collaborators.md long_description = file: readme.md, changelog.md, collaborators.md
long_description_content_type = text/markdown long_description_content_type = text/markdown