Compare commits
No commits in common. "a8928587f2698ee20e6c2be3a024e988b5368397" and "21fb9a4a8d07846134f2293f902c51a56da6c261" have entirely different histories.
a8928587f2
...
21fb9a4a8d
|
@ -1,12 +1,6 @@
|
|||
Changelog
|
||||
=========
|
||||
|
||||
0.8.3
|
||||
-----
|
||||
|
||||
* Fix password change views
|
||||
* Show errors on delete view
|
||||
|
||||
0.8.2
|
||||
-----
|
||||
|
||||
|
|
|
@ -34,7 +34,6 @@ class GASLoginView(LoginView):
|
|||
class GASPasswordChangeView(GASMixin, PasswordChangeView):
|
||||
template_name = 'gas/base_form.html'
|
||||
success_url = reverse_lazy('gas:index')
|
||||
continue_url = reverse_lazy('gas:change_password')
|
||||
title = _('Change your password')
|
||||
success_message = _('Password changed.')
|
||||
|
||||
|
|
|
@ -75,9 +75,6 @@ class ChangePasswordUser(BaseMixin, gviews.GASMixin, FormView):
|
|||
def get_title(self):
|
||||
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):
|
||||
kwargs = super().get_form_kwargs()
|
||||
kwargs['user'] = self.user
|
||||
|
|
|
@ -23,10 +23,10 @@
|
|||
<li><a href="{{ view.get_cancel_url }}">{% trans "Cancel" %}</a></li>
|
||||
{% endif %}
|
||||
|
||||
<li><button type="submit">{% trans "Save" %}</button></li>
|
||||
<li><button type="submit">{% trans "Save" %}</button>
|
||||
|
||||
{% 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 %}
|
||||
{% block extra_form_actions %}{% endblock %}
|
||||
{% endblock form_actions %}
|
||||
|
|
|
@ -1,12 +1,10 @@
|
|||
{% extends base_template %}
|
||||
|
||||
{% load i18n %}
|
||||
{% load form_tags %}
|
||||
|
||||
{% block ui_title %}{% trans "Delete confirmation" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% form_errors form %}
|
||||
<p>{{ confirmation_text }}</p>
|
||||
|
||||
{% if show_deleted_objects %}
|
||||
|
|
Loading…
Reference in New Issue