fix

abonapp/forms.py

@@ -158,15 +158,15 @@ class ExportUsersForm(forms.Form):
         ('fio', _('fio')),
         ('ip_address', _('Ip Address')),
         ('description', _('Comment')),
-        ('street', _('Street')),
+        ('street__name', _('Street')),
         ('house', _('House')),
         ('birth_day', _('birth day')),
         ('is_active', _('Is active')),
         ('telephone', _('Telephone')),
-        ('current_tariff', _('Service title')),
+        ('current_tariff__tariff__title', _('Service title')),
         ('ballance', _('Ballance')),
-        ('device', _('Device')),
-        ('dev_port', _('Device port')),
+        ('device__comment', _('Device')),
+        ('dev_port__descr', _('Device port')),
         ('is_dynamic_ip', _('Is dynamic ip'))
     )
     fields = forms.MultipleChoiceField(choices=FIELDS_CHOICES,

abonapp/templates/abonapp/peoples.html

@@ -136,6 +136,9 @@
                             <a href="{% url 'abonapp:phonebook' abon_group.pk %}" class="btn btn-default btn-modal">
                                 <span class="glyphicon glyphicon-earphone"></span> {% trans 'Phonebook' %}
                             </a>
+                            <a href="{% url 'abonapp:abon_export' abon_group.pk %}" class="btn btn-default btn-modal">
+                                <span class="glyphicon glyphicon-export"></span> {% trans 'Export users' %}
+                            </a>
                         </td>
                     </tr>
                     </tfoot>

abonapp/views.py

@@ -923,6 +923,8 @@ def abon_export(request, gid):
                 response = HttpResponse(content_type='text/csv')
                 response['Content-Disposition'] = 'attachment; filename="users.csv"'
                 writer = csv.writer(response, quoting=csv.QUOTE_NONNUMERIC)
+                display_values = [f[1] for f in frm.fields['fields'].choices if f[0] in fields]
+                writer.writerow(display_values)
                 for row in subscribers:
                     writer.writerow(row)
                 return response