Merge pull request #472 from GreatFruitOmsk/459-comment-recommended-a…

…ction Replace "Comment" with "Recommended Actions"
WoTTsecurity · Oct 16, 2019 · 7b148d1 · 7b148d1
2 parents ead1efc + c565da1
commit 7b148d1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/backend/device_registry/models.py b/backend/device_registry/models.py
@@ -224,11 +224,12 @@ def hostname(self):
 
     @property
     def actions_count(self):
-        return sum((self.deviceinfo.default_password is True,
-                    self.firewallstate.policy != FirewallState.POLICY_ENABLED_BLOCK,
-                    bool(self.vulnerable_packages and self.vulnerable_packages.exists()),
-                    bool(self.insecure_services),
-                    bool(self.sshd_issues())))
+        if hasattr(self, 'firewallstate') and hasattr(self, 'portscan'):
+            return sum((self.deviceinfo.default_password is True,
+                        self.firewallstate.policy != FirewallState.POLICY_ENABLED_BLOCK,
+                        bool(self.vulnerable_packages and self.vulnerable_packages.exists()),
+                        bool(self.insecure_services),
+                        bool(self.sshd_issues())))
 
     COEFFICIENTS = {
         'app_armor_enabled': .5,

diff --git a/backend/device_registry/serializers.py b/backend/device_registry/serializers.py
@@ -1,5 +1,6 @@
 from django.utils.translation import ugettext_lazy as _
 from django.utils.timesince import timesince
+from django.urls import reverse
 
 from rest_framework import serializers
 from rest_framework.utils.representation import smart_repr
@@ -222,4 +223,8 @@ class Meta:
     def to_representation(self, instance):
         representation = super(DeviceListSerializer, self).to_representation(instance)
         representation['last_ping'] = timesince(instance.last_ping) + ' ago'
+        representation['actions'] = {
+            'count': instance.actions_count or '',
+            'url': reverse('device_actions', args=[instance.pk])
+        }
         return representation
diff --git a/backend/device_registry/templates/root.html b/backend/device_registry/templates/root.html
@@ -349,7 +349,7 @@ <h4 class="modal-title" id="modal-title"></h4>
             {data: 'hostname' },
             {data: 'last_ping', type: 'last-ping' , orderable: true, sortable:true,},
             {data: 'trust_score', render: render_trustscore },
-            {data: 'comment' },
+            {data: 'actions', render: render_actions_count }
         ],
         select: {
             style:    'os multi+shift',
@@ -648,6 +648,11 @@ <h4 class="modal-title" id="modal-title"></h4>
       }
       $('.toast').toast({delay: 5000});
 
+      function render_actions_count(data, type, row, meta) {
+          if (type == 'sort') return data;
+          return data? `<a class="badge badge-pill badge-primary" href="${data.url}"}>${data.count}</span>`: "";
+      }
+
   {% if not user.profile.wizard_shown %}
     $(() => {
         let sidebarToggled = false;

diff --git a/backend/device_registry/views.py b/backend/device_registry/views.py
@@ -44,7 +44,7 @@ def get_context_data(self, **kwargs):
                 'Hostname',
                 'Last Ping',
                 'Trust Score',
-                'Comment'
+                'Recommended Actions'
             ],
             'filter_params': [(field_name, field_desc[1], field_desc[2]) for field_name, field_desc in
                               self.FILTER_FIELDS.items()],