diff --git a/registration/backends/default/views.py b/registration/backends/default/views.py index 54504d93..b1edd557 100644 --- a/registration/backends/default/views.py +++ b/registration/backends/default/views.py @@ -254,8 +254,9 @@ def complete_registration(request): response = {'success': False} form = RegistrationCompleteForm(request.POST, instance=request.user) if form.is_valid(): - form.save() + user = form.save() response['success']=True + response['redirect'] = user.get_permanent_url() else: response['errors'] = form.errors return HttpResponse(json.dumps(response), content_type='application/json') diff --git a/service/views.py b/service/views.py index 718918bc..949c27ac 100644 --- a/service/views.py +++ b/service/views.py @@ -43,7 +43,7 @@ def advertise(request): form.save() response['success'] = True else: - response['erros'] = form.errors + response['errors'] = form.errors return HttpResponse(json.dumps(response), content_type='application/json') diff --git a/templates/client/includes/exposition/exposition_list.html b/templates/client/includes/exposition/exposition_list.html index db448eb1..10e8ba60 100644 --- a/templates/client/includes/exposition/exposition_list.html +++ b/templates/client/includes/exposition/exposition_list.html @@ -68,7 +68,7 @@
{% include 'client/includes/exposition/services.html' with obj=obj %} - {% include 'client/includes/calendar_button.html' with event=obj user=user %} + {% include 'client/includes/calendar_button.html' with obj=obj%}
{% with note=obj|note_by_user:request.user %} {% trans 'заметка' %} diff --git a/templates/client/includes/exposition/exposition_object.html b/templates/client/includes/exposition/exposition_object.html index 121260e6..a18df1df 100644 --- a/templates/client/includes/exposition/exposition_object.html +++ b/templates/client/includes/exposition/exposition_object.html @@ -73,20 +73,18 @@ {% with event=exposition user=user %} {% include 'client/includes/visit_button.html' %} {% endwith %} - - {% with event=exposition user=user %} - {% include 'client/includes/calendar_button.html' %} - {% endwith %} + {% include 'client/includes/calendar_button.html' with obj=object %}
- - - {% trans 'заметка' %} + {% with note=object|note_by_user:request.user %} + {% trans 'заметка' %}
+ {% endwith %}
+ {% if request.user.is_admin %} {% trans 'изменить' %} {% endif %} diff --git a/templates/client/static_client/js/_modules/block.registration.completion.js b/templates/client/static_client/js/_modules/block.registration.completion.js index 5a15339f..1f3f77ca 100644 --- a/templates/client/static_client/js/_modules/block.registration.completion.js +++ b/templates/client/static_client/js/_modules/block.registration.completion.js @@ -25,7 +25,7 @@ if (EXPO.registration.completion) { errClass = EXPO.common.opt.errMessageClass; $('.'+errClass,$popup).removeClass(activeClass); if (data.success) { - location.reload(); + location = data.redirect; } else { console.log(data);