Browse Source

Fix bugs

devel
bashmak 8 years ago
parent
commit
1b736e23ab
  1. 9
      abonapp/views.py
  2. 24
      clientsideapp/templates/clientsideapp/ext.html

9
abonapp/views.py

@ -1,6 +1,6 @@
from typing import Dict, Optional from typing import Dict, Optional
from django.contrib.gis.shortcuts import render_to_text from django.contrib.gis.shortcuts import render_to_text
from django.core.exceptions import PermissionDenied
from django.core.exceptions import PermissionDenied, ValidationError
from django.db import IntegrityError, ProgrammingError, transaction from django.db import IntegrityError, ProgrammingError, transaction
from django.db.models import Count, Q from django.db.models import Count, Q
from django.shortcuts import render, redirect, get_object_or_404, resolve_url from django.shortcuts import render, redirect, get_object_or_404, resolve_url
@ -1097,6 +1097,13 @@ class EditSibscriberMarkers(UpdateView):
obj = models.Abon.objects.get(username=self.kwargs.get('uname')) obj = models.Abon.objects.get(username=self.kwargs.get('uname'))
return obj return obj
def dispatch(self, request, *args, **kwargs):
try:
return super(EditSibscriberMarkers, self).dispatch(request, *args, **kwargs)
except ValidationError as e:
messages.error(request, e)
return self.render_to_response(self.get_context_data())
def get_success_url(self): def get_success_url(self):
return resolve_url('abonapp:abon_home', self.kwargs.get('gid'), self.kwargs.get('uname')) return resolve_url('abonapp:abon_home', self.kwargs.get('gid'), self.kwargs.get('uname'))

24
clientsideapp/templates/clientsideapp/ext.html

@ -51,18 +51,18 @@
<a href="{{ client_side_services }}">{% trans 'Services' %}</a> <a href="{{ client_side_services }}">{% trans 'Services' %}</a>
</li> </li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans 'Language' %} <b class="caret"></b></a>
<ul class="dropdown-menu">
{% url 'set_language' as set_language_url %}
{% for lang in LANGUAGES %}
<li><a href="#" id="langfrm_{{ lang.0 }}" onclick="document.setLang{{ lang.0 }}.submit();">{{ lang.1 }}</a></li>
<form name="setLang{{ lang.0}}" action="{{ set_language_url }}" method="POST" class="hidden">{% csrf_token %}
<input type="hidden" name="language" value="{{ lang.0 }}">
</form>
{% endfor %}
</ul>
</li>
{# <li class="dropdown">#}
{# <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans 'Language' %} <b class="caret"></b></a>#}
{# <ul class="dropdown-menu">#}
{# {% url 'set_language' as set_language_url %}#}
{# {% for lang in LANGUAGES %}#}
{# <li><a href="#" id="langfrm_{{ lang.0 }}" onclick="document.setLang{{ lang.0 }}.submit();">{{ lang.1 }}</a></li>#}
{# <form name="setLang{{ lang.0}}" action="{{ set_language_url }}" method="POST" class="hidden">{% csrf_token %}#}
{# <input type="hidden" name="language" value="{{ lang.0 }}">#}
{# </form>#}
{# {% endfor %}#}
{# </ul>#}
{# </li>#}
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans 'Other' %} <b class="caret"></b></a> <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans 'Other' %} <b class="caret"></b></a>

Loading…
Cancel
Save