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

dialing_app/models.py

@@ -57,7 +57,7 @@ class AsteriskCDR(models.Model):
             return "%s/recording/request" % path
         elif self.userfield == 'report':
             return "%s/recording/bug" % path
-        return path
+        return "%s/monitor" % path
 
     class Meta:
         db_table = 'cdr'

dialing_app/templates/index.html

@@ -21,7 +21,7 @@
             <tbody>
             {% for log in logs %}
                 <tr>
-                    <td class="btn-group btn-group-sm">
+                    <td class="btn-group btn-group-sm btn-group-justify">
                         <button class="btn btn-default player-btn disabled">
                             <span class="glyphicon glyphicon-play"></span>
                             <audio preload="metadata" src="{{ log.path_to_media }}/{{ log.calldate|date:"YmdHi" }}-{{ log.src }}-{{ log.dst }}.wav"></audio>

dialing_app/views.py

@@ -11,7 +11,7 @@ from .models import AsteriskCDR
 @login_required
 @only_admins
 def home(request):
-    logs = AsteriskCDR.objects.order_by('-calldate')
+    logs = AsteriskCDR.objects.exclude(userfield='request').order_by('-calldate')
     logs = pag_mn(request, logs)
     title = _('Last calls')
     return render(request, 'index.html', {
@@ -46,4 +46,4 @@ def vmail(request):
     return render(request, 'vmail.html', {
         'title': title,
         'vmessages': cdr
-    })
+    })

taskapp/templates/taskapp/tasklist.html

@@ -36,7 +36,7 @@
                 <td><a href="{% url 'taskapp:view' task.pk %}" target="_blank">{{ task.pk }}</a></td>
 
                 {% if task.abon and task.abon.group %}
-                    <td><a href="{% url 'abonapp:abon_home' task.abon.group.pk task.abon.pk %}" target="_blank">{{ task.abon.get_full_name }}</a></td>
+		    <td><a href="{% url 'abonapp:abon_home' task.abon.group.pk task.abon.pk %}" target="_blank" title="{{ task.abon.description|default:'' }}" data-toggle="tooltip">{{ task.abon.get_full_name }}</a></td>
 		    <td>{{ task.abon.group.title }}, {{ task.abon.street|default:_('Not assigned') }} {{ task.abon.house|default:_('Not assigned') }}</td>
                 {% else %}
                     <td>{% trans 'User does not exist' %}</td>