Merge branch 'devel' of https://github.com/nerosketch/djing into devel

изменено:      abonapp/templates/abonapp/editAbon.html
	изменено:      abonapp/templates/abonapp/peoples.html
	изменено:      dhcp_lever.py
	изменено:      searchapp/views.py

abonapp/templates/abonapp/editAbon.html

@@ -31,7 +31,7 @@
                                 <div class="input-group input-group-sm">
                                     {{ form.telephone }}{{ form.telephone.errors }}
                                     <span class="input-group-btn">
-                                        <a href="tel:{{ form.telephone.value }}" class="btn btn-default">
+                                        <a href="sip:{{ form.telephone.value }}" class="btn btn-default">
                                             <span class="glyphicon glyphicon-earphone"></span>
                                         </a>
                                     </span>

abonapp/templates/abonapp/peoples.html

@@ -153,4 +153,4 @@
 
     {% include 'toolbar_page.html' with pag=peoples %}
 
-{% endblock %}
+{% endblock %}

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])

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)):