From 51a0ebe654fb548c7953d30bfc235afabe6ce567 Mon Sep 17 00:00:00 2001 From: http Date: Thu, 25 May 2017 14:43:16 +0300 Subject: [PATCH 1/4] tel: to sip: --- abonapp/templates/abonapp/editAbon.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 }} - + From 0db62b9e3ba59c531d14973db5b22f3b610963fe Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Thu, 25 May 2017 16:47:58 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=9D=D0=B0=D0=B4=D0=BE=20=D0=B1=D1=8B?= =?UTF-8?q?=D0=BB=D0=BE=20=D1=83=D0=B1=D1=80=D0=B0=D1=82=D1=8C=20=D0=BE?= =?UTF-8?q?=D1=82=D1=81=D1=8E=D0=B4=D0=B0=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8E=20=D1=87=D1=82=D0=BE=D0=B1?= =?UTF-8?q?=20=D0=BD=D0=B5=20=D0=B8=D0=BD=D0=B8=D1=86=D0=B8=D0=B8=D0=BB?= =?UTF-8?q?=D0=B8=D0=B7=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20django?= =?UTF-8?q?=20=D1=82=D1=83=D1=82,=20=D0=B0=20=D1=82=D0=BE=20django=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=BB=D0=B3=D0=BE=20=D0=B8=D0=BD=D0=B8=D1=86=D0=B8?= =?UTF-8?q?=D0=B8=D0=BB=D0=B8=D0=B7=D0=B8=D1=80=D1=83=D0=B5=D1=82=D1=81?= =?UTF-8?q?=D1=8F,=20=D0=B4=D0=B0=20=D0=B8=20=D0=B2=20=D0=BB=D0=BE=D0=B3?= =?UTF-8?q?=D0=B0=D1=85=20=D0=BB=D1=83=D1=87=D1=88=D0=B5=20=D0=BF=D0=B8?= =?UTF-8?q?=D1=81=D0=B0=D1=82=D1=8C=20=D0=BB=D0=B0=D1=82=D0=B8=D0=BD=D0=B8?= =?UTF-8?q?=D1=86=D0=B5=D0=B9=20=D0=BD=D0=B0=20=D0=B2=D1=81=D1=8F=D0=BA?= =?UTF-8?q?=D0=B8=D0=B9=20=D1=81=D0=BB=D1=83=D1=87=D0=B0=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dhcp_lever.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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]) From fa90ab6324ba24ba916cbeb889c3d7e21cbb8069 Mon Sep 17 00:00:00 2001 From: http Date: Mon, 29 May 2017 11:38:40 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=B4=D0=B5=D0=BD=D1=8C=20=D0=BD=D0=B5=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- abonapp/templates/abonapp/peoples.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abonapp/templates/abonapp/peoples.html b/abonapp/templates/abonapp/peoples.html index ddaf443..ad334f7 100644 --- a/abonapp/templates/abonapp/peoples.html +++ b/abonapp/templates/abonapp/peoples.html @@ -75,7 +75,7 @@ {% if human.traf %} - {{ human.traf.cur_time|date:"H:i" }} + {{ human.traf.cur_time|date:"D H:i" }} {% endif %} {{ human.ip_address|default:_('Not assigned') }} @@ -149,4 +149,4 @@ {% include 'toolbar_page.html' with pag=peoples %} -{% endblock %} \ No newline at end of file +{% endblock %} From ba05d169823993e1c4020a74a9e2d664d2806482 Mon Sep 17 00:00:00 2001 From: http Date: Mon, 29 May 2017 11:40:12 +0300 Subject: [PATCH 4/4] =?UTF-8?q?FIXBUG:=20=D0=A1=D0=B2=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=B2=D0=B0=D0=BB=D1=81=D1=8F=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA?= =?UTF-8?q?=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=B5=D1=81=D1=82=D1=8C=20=D1=81?= =?UTF-8?q?=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB=20'+'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- searchapp/views.py | 1 + 1 file changed, 1 insertion(+) 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)):