From ea8beb6cd6bfc5c085e72acd7648ca7017530532 Mon Sep 17 00:00:00 2001
From: Dmitry Novikov <nerosketch@gmail.com>
Date: Mon, 1 Jul 2019 10:01:37 +0300
Subject: [PATCH] add titles in devices app

---
 devapp/templates/devapp/add_dev.html            | 2 ++
 devapp/templates/devapp/dev.html                | 3 +++
 devapp/templates/devapp/devices.html            | 2 ++
 devapp/templates/devapp/devices_null_group.html | 4 +++-
 devapp/templates/devapp/ext.htm                 | 1 +
 devapp/templates/devapp/fix_dev_group.html      | 2 ++
 devapp/templates/devapp/group_list.html         | 2 ++
 devapp/views.py                                 | 3 +--
 templates/all_base.html                         | 2 +-
 9 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/devapp/templates/devapp/add_dev.html b/devapp/templates/devapp/add_dev.html
index af23896..fd9c618 100644
--- a/devapp/templates/devapp/add_dev.html
+++ b/devapp/templates/devapp/add_dev.html
@@ -1,6 +1,8 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
 {% load i18n bootstrap3 %}
 
+{% block title %}{% trans 'Add new device' %}{% endblock %}
+
 {% block breadcrumb %}
     <ol class="breadcrumb">
         <li><span class="glyphicon glyphicon-home"></span></li>
diff --git a/devapp/templates/devapp/dev.html b/devapp/templates/devapp/dev.html
index 2108fcf..9f300a4 100644
--- a/devapp/templates/devapp/dev.html
+++ b/devapp/templates/devapp/dev.html
@@ -1,5 +1,8 @@
 {% extends request.is_ajax|yesno:'nullcont.htm,devapp/ext.htm' %}
 {% load i18n bootstrap3 %}
+
+{% block title %}{{ form.comment.value }}{% endblock %}
+
 {% block content %}
 
 <div class="panel panel-default">
diff --git a/devapp/templates/devapp/devices.html b/devapp/templates/devapp/devices.html
index 59c020d..e2d95a0 100644
--- a/devapp/templates/devapp/devices.html
+++ b/devapp/templates/devapp/devices.html
@@ -1,6 +1,8 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
 {% load i18n dpagination %}
 
+{% block title %}{% trans 'Devices' %} - {{ group.title }}{% endblock %}
+
 {% block breadcrumb %}
     <ol class="breadcrumb">
         <li><span class="glyphicon glyphicon-home"></span></li>
diff --git a/devapp/templates/devapp/devices_null_group.html b/devapp/templates/devapp/devices_null_group.html
index f8e4c73..476175b 100644
--- a/devapp/templates/devapp/devices_null_group.html
+++ b/devapp/templates/devapp/devices_null_group.html
@@ -1,6 +1,8 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
 {% load i18n dpagination %}
 
+{% block title %}{% trans 'Devices without group' %}{% endblock %}
+
 {% block breadcrumb %}
     <ol class="breadcrumb">
         <li><span class="glyphicon glyphicon-home"></span></li>
@@ -80,4 +82,4 @@
 
         </table>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/devapp/templates/devapp/ext.htm b/devapp/templates/devapp/ext.htm
index 454a1af..174e378 100644
--- a/devapp/templates/devapp/ext.htm
+++ b/devapp/templates/devapp/ext.htm
@@ -1,6 +1,7 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
 {% load i18n %}
 
+{% block title %}{{ dev.comment }}{% endblock %}
 
 {% block breadcrumb %}
     <ol class="breadcrumb">
diff --git a/devapp/templates/devapp/fix_dev_group.html b/devapp/templates/devapp/fix_dev_group.html
index 3c8d613..e1bbbc1 100644
--- a/devapp/templates/devapp/fix_dev_group.html
+++ b/devapp/templates/devapp/fix_dev_group.html
@@ -1,6 +1,8 @@
 {% extends request.is_ajax|yesno:'bajax.html,base.html' %}
 {% load i18n bootstrap3 %}
 
+{% block title %}{% trans 'Fix device group' %}{% endblock %}
+
 {% block breadcrumb %}
     <ol class="breadcrumb">
         <li><span class="glyphicon glyphicon-home"></span></li>
diff --git a/devapp/templates/devapp/group_list.html b/devapp/templates/devapp/group_list.html
index a3f2c9d..10c7d6e 100644
--- a/devapp/templates/devapp/group_list.html
+++ b/devapp/templates/devapp/group_list.html
@@ -1,6 +1,8 @@
 {% extends 'base.html' %}
 {% load i18n %}
 
+{% block title %}{% trans 'Devices' %}{% endblock %}
+
 {% block breadcrumb %}
     <ol class="breadcrumb">
         <li><span class="glyphicon glyphicon-home"></span></li>
diff --git a/devapp/views.py b/devapp/views.py
index 3687918..3cc2014 100644
--- a/devapp/views.py
+++ b/devapp/views.py
@@ -599,9 +599,8 @@ class GroupsListView(LoginAdminMixin, global_base_views.OrderedFilteredList):
     model = Group
 
     def get_queryset(self):
-        groups = super(GroupsListView, self).get_queryset()
         groups = get_objects_for_user(self.request.user,
-                                      'group_app.view_group', klass=groups,
+                                      'group_app.view_group', klass=Group,
                                       accept_global_perms=False)
         return groups
 
diff --git a/templates/all_base.html b/templates/all_base.html
index 8e8351a..b800f4c 100644
--- a/templates/all_base.html
+++ b/templates/all_base.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>{% load i18n globaltags static %}
 <html lang="{{ LANGUAGE_CODE }}">
 <head>
-    <title>{% global_var 'COMPANY_NAME' %} - {% trans 'Admin side' %}</title>
+    <title>{% block title %}{% global_var 'COMPANY_NAME' %} - {% trans 'Admin side' %}{% endblock %}</title>
     <meta charset="UTF-8">
     <!--[if lt IE 9]><meta http-equiv="refresh" content="0;URL={% static 'bad_ie.html' %}" /><![endif]-->
     <meta name="viewport" content="width=device-width, initial-scale=1.0">