Compare commits
	
		
			4 Commits
		
	
	
		
			21fb9a4a8d
			...
			a8928587f2
		
	
	| Author | SHA1 | Date | 
|---|---|---|
| 
							
							
								
									
								
								 | 
						a8928587f2 | |
| 
							
							
								
									
								
								 | 
						ca25e62e35 | |
| 
							
							
								
									
								
								 | 
						9a10e3cd35 | |
| 
							
							
								
									
								
								 | 
						f38b38f790 | 
| 
						 | 
				
			
			@ -1,6 +1,12 @@
 | 
			
		|||
Changelog
 | 
			
		||||
=========
 | 
			
		||||
 | 
			
		||||
0.8.3
 | 
			
		||||
-----
 | 
			
		||||
 | 
			
		||||
* Fix password change views
 | 
			
		||||
* Show errors on delete view
 | 
			
		||||
 | 
			
		||||
0.8.2
 | 
			
		||||
-----
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -34,6 +34,7 @@ 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,6 +75,9 @@ 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><button type="submit">{% trans "Save" %}</button></li>
 | 
			
		||||
 | 
			
		||||
            {% if not is_popup %}
 | 
			
		||||
                <li><button name="save_and_continue" type="submit">{% trans "Save and continue" %}</button>
 | 
			
		||||
                <li><button name="save_and_continue" type="submit">{% trans "Save and continue" %}</button></li>
 | 
			
		||||
            {% endif %}
 | 
			
		||||
            {% block extra_form_actions %}{% endblock %}
 | 
			
		||||
        {% endblock form_actions %}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,10 +1,12 @@
 | 
			
		|||
{% 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