Merge branch 'feature' into feature-ui

netbox/core/tables/change_logging.py

@@ -48,6 +48,6 @@ class ObjectChangeTable(NetBoxTable):
     class Meta(NetBoxTable.Meta):
         model = ObjectChange
         fields = (
-            'pk', 'id', 'time', 'user_name', 'full_name', 'action', 'changed_object_type', 'object_repr', 'request_id',
+            'pk', 'time', 'user_name', 'full_name', 'action', 'changed_object_type', 'object_repr', 'request_id',
             'actions',
         )

netbox/release.yaml

@@ -1,2 +1,3 @@
 version: "4.1.0"
-designation: "dev"
+edition: Community
+designation: dev

netbox/templates/base/layout.html

@@ -42,7 +42,8 @@ Blocks:
         </h1>
 
         {# User menu (mobile view) #}
-        <div class="navbar-nav flex-row d-lg-none">
+        <div class="navbar-nav flex-row align-items-center d-lg-none">
+          {% plugin_navbar %}
           {% include 'inc/light_toggle.html' %}
           {% include 'inc/user_menu.html' %}
         </div>
@@ -59,15 +60,10 @@ Blocks:
     <header class="navbar navbar-expand-md sticky-top d-none d-lg-flex d-print-none">
       <div class="container-fluid">
 
+        {# User menu (desktop view) #}
         <div class="navbar-nav flex-row align-items-center order-md-last">
-
-          {# Plugin content #}
           {% plugin_navbar %}
-
-          {# Dark/light mode toggle #}
           {% include 'inc/light_toggle.html' %}
-
-          {# User menu #}
           {% include 'inc/user_menu.html' %}
         </div>
 

netbox/utilities/release.py

@@ -1,8 +1,8 @@
 import datetime
 import os
 import yaml
-from dataclasses import dataclass
-from typing import Union
+from dataclasses import dataclass, field
+from typing import List, Union
 
 from django.core.exceptions import ImproperlyConfigured
 
@@ -15,9 +15,10 @@ LOCAL_RELEASE_PATH = 'local/release.yaml'
 @dataclass
 class ReleaseInfo:
     version: str
-    edition: str = 'Community'
+    edition: str
     published: Union[datetime.date, None] = None
     designation: Union[str, None] = None
+    features: List = field(default_factory=list)
 
     @property
     def full_version(self):
@@ -46,11 +47,12 @@ def load_release_data():
             local_data = yaml.safe_load(release_file)
     except FileNotFoundError:
         local_data = {}
-    if type(local_data) is not dict:
-        raise ImproperlyConfigured(
-            f"{LOCAL_RELEASE_PATH}: Local release data must be defined as a dictionary."
-        )
-    data.update(local_data)
+    if local_data is not None:
+        if type(local_data) is not dict:
+            raise ImproperlyConfigured(
+                f"{LOCAL_RELEASE_PATH}: Local release data must be defined as a dictionary."
+            )
+        data.update(local_data)
 
     # Convert the published date to a date object
     if 'published' in data: