diff --git a/abonapp/templates/abonapp/editAbon.html b/abonapp/templates/abonapp/editAbon.html index a5c2698..8324b9b 100644 --- a/abonapp/templates/abonapp/editAbon.html +++ b/abonapp/templates/abonapp/editAbon.html @@ -31,7 +31,7 @@
{{ form.telephone }}{{ form.telephone.errors }} - + diff --git a/abonapp/templates/abonapp/peoples.html b/abonapp/templates/abonapp/peoples.html index 16e9538..2b04bfd 100644 --- a/abonapp/templates/abonapp/peoples.html +++ b/abonapp/templates/abonapp/peoples.html @@ -153,4 +153,4 @@ {% include 'toolbar_page.html' with pag=peoples %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/dhcp_lever.py b/dhcp_lever.py index fe7aec9..f6ac08c 100755 --- a/dhcp_lever.py +++ b/dhcp_lever.py @@ -2,7 +2,6 @@ import sys from redis import Redis from rq import Queue -from django.utils.translation import ugettext as _ def die(text): @@ -13,12 +12,12 @@ def die(text): if __name__ == "__main__": argv = sys.argv if len(argv) < 3: - die(_('Too few arguments, exiting...')) + die('Too few arguments, exiting...') action = argv[1] q = Queue(connection=Redis()) if action == 'commit': if len(argv) < 6: - die(_('Too few arguments, exiting...')) + die('Too few arguments, exiting...') q.enqueue('agent.commands.dhcp.dhcp_commit', argv[2], argv[3], argv[4], int(argv[5])) elif action == 'expiry': q.enqueue('agent.commands.dhcp.dhcp_expiry', argv[2]) diff --git a/searchapp/views.py b/searchapp/views.py index 30bc4c7..e9155fe 100644 --- a/searchapp/views.py +++ b/searchapp/views.py @@ -12,6 +12,7 @@ def replace_without_case(orig, old, new): def home(request): s = request.GET.get('s') + s = s.replace('+', '') if s: if bool(re.match(ip_addr_regex, s)):