Merge branch '346-do-not-allow-to-add-hidden-dashboard-widgets-to-personal-dashboard' into 'master'

Resolve "Do not allow to add hidden dashboard widgets to personal dashboard"

Closes #346

See merge request !444

aleksis/core/models.py

@@ -239,7 +239,10 @@ class Person(ExtensibleModel):
     @property
     def dashboard_widgets(self):
         return [
-            w.widget for w in DashboardWidgetOrder.objects.filter(person=self).order_by("order")
+            w.widget
+            for w in DashboardWidgetOrder.objects.filter(person=self, widget__active=True).order_by(
+                "order"
+            )
         ]
 
     def save(self, *args, **kwargs):
@@ -749,7 +752,12 @@ class DashboardWidgetOrder(ExtensibleModel):
     @classproperty
     def default_dashboard_widgets(cls):
         """Get default order for dashboard widgets."""
-        return [w.widget for w in cls.objects.filter(person=None, default=True).order_by("order")]
+        return [
+            w.widget
+            for w in cls.objects.filter(person=None, default=True, widget__active=True).order_by(
+                "order"
+            )
+        ]
 
     class Meta:
         verbose_name = _("Dashboard widget order")

aleksis/core/views.py

@@ -868,7 +868,9 @@ class EditDashboardView(View):
             if not self.default_dashboard
             else DashboardWidgetOrder.default_dashboard_widgets
         )
-        not_used_widgets = DashboardWidget.objects.exclude(pk__in=[w.pk for w in widgets])
+        not_used_widgets = DashboardWidget.objects.exclude(pk__in=[w.pk for w in widgets]).filter(
+            active=True
+        )
         context["widgets"] = widgets
         context["not_used_widgets"] = not_used_widgets