diff --git a/netbox/core/views.py b/netbox/core/views.py index 06c8b00d0..616cbb60e 100644 --- a/netbox/core/views.py +++ b/netbox/core/views.py @@ -630,10 +630,11 @@ class SystemView(UserPassesTestMixin, View): # Raw data export if 'export' in request.GET: + params = [param.name for param in PARAMS] data = { **stats, 'config': { - k: config.data[k] for k in sorted(config.data) + k: getattr(config, k) for k in sorted(params) }, } response = HttpResponse(json.dumps(data, indent=4), content_type='text/json') diff --git a/netbox/project-static/yarn.lock b/netbox/project-static/yarn.lock index 4f9111c89..bb0bea154 100644 --- a/netbox/project-static/yarn.lock +++ b/netbox/project-static/yarn.lock @@ -867,13 +867,20 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^3.0.2, braces@~3.0.2: +braces@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== dependencies: fill-range "^7.0.1" +braces@~3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== + dependencies: + fill-range "^7.1.1" + call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" @@ -1520,10 +1527,10 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== +fill-range@^7.0.1, fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== dependencies: to-regex-range "^5.0.1" @@ -1816,9 +1823,9 @@ ignore@^5.2.0: integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw== immutable@^4.0.0: - version "4.3.6" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.6.tgz#6a05f7858213238e587fb83586ffa3b4b27f0447" - integrity sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ== + version "4.3.7" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.7.tgz#c70145fc90d89fb02021e65c84eb0226e4e5a381" + integrity sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw== import-fresh@^3.2.1: version "3.3.0" diff --git a/netbox/templates/core/rq_worker_list.html b/netbox/templates/core/rq_worker_list.html index d0d8b9149..92ea601ac 100644 --- a/netbox/templates/core/rq_worker_list.html +++ b/netbox/templates/core/rq_worker_list.html @@ -24,7 +24,12 @@ {% endblock page-header %} -{% block title %}{{ status|capfirst }} {% trans "Workers in " %}{{ queue.name }}{% endblock %} +{% block title %} + {{ status|capfirst }} + {% blocktrans trimmed with queue_name=queue.name %} + Workers in {{ queue_name }} + {% endblocktrans %} +{% endblock %} {% block controls %}{% endblock %} diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index a6fa6e7f7..e37ad9ca6 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-07-20 05:02+0000\n" +"POT-Creation-Date: 2024-07-27 05:02+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -6955,7 +6955,7 @@ msgstr "" #: netbox/extras/forms/model_forms.py:163 #: netbox/extras/forms/model_forms.py:204 #: netbox/extras/forms/model_forms.py:261 -#: netbox/extras/forms/model_forms.py:365 netbox/users/forms/model_forms.py:273 +#: netbox/extras/forms/model_forms.py:365 netbox/users/forms/model_forms.py:277 msgid "Object types" msgstr "" @@ -7321,7 +7321,7 @@ msgstr "" #: netbox/templates/extras/configcontext.html:60 #: netbox/templates/ipam/ipaddress.html:59 #: netbox/templates/ipam/vlan_edit.html:30 -#: netbox/tenancy/forms/filtersets.py:87 netbox/users/forms/model_forms.py:311 +#: netbox/tenancy/forms/filtersets.py:87 netbox/users/forms/model_forms.py:315 msgid "Assignment" msgstr "" @@ -10299,13 +10299,13 @@ msgid "Admin" msgstr "" #: netbox/netbox/navigation/menu.py:374 netbox/templates/users/group.html:29 -#: netbox/users/forms/model_forms.py:233 netbox/users/forms/model_forms.py:245 -#: netbox/users/forms/model_forms.py:297 netbox/users/tables.py:102 +#: netbox/users/forms/model_forms.py:237 netbox/users/forms/model_forms.py:249 +#: netbox/users/forms/model_forms.py:301 netbox/users/tables.py:102 msgid "Users" msgstr "" #: netbox/netbox/navigation/menu.py:394 netbox/users/forms/model_forms.py:182 -#: netbox/users/forms/model_forms.py:194 netbox/users/forms/model_forms.py:302 +#: netbox/users/forms/model_forms.py:194 netbox/users/forms/model_forms.py:306 #: netbox/users/tables.py:35 netbox/users/tables.py:106 msgid "Groups" msgstr "" @@ -10316,8 +10316,8 @@ msgid "API Tokens" msgstr "" #: netbox/netbox/navigation/menu.py:421 netbox/users/forms/model_forms.py:188 -#: netbox/users/forms/model_forms.py:196 netbox/users/forms/model_forms.py:239 -#: netbox/users/forms/model_forms.py:246 +#: netbox/users/forms/model_forms.py:196 netbox/users/forms/model_forms.py:243 +#: netbox/users/forms/model_forms.py:250 msgid "Permissions" msgstr "" @@ -12009,7 +12009,7 @@ msgstr "" #: netbox/templates/dcim/virtualchassis_add_member.html:27 #: netbox/templates/generic/object_edit.html:78 #: netbox/templates/users/objectpermission.html:31 -#: netbox/users/forms/filtersets.py:68 netbox/users/forms/model_forms.py:309 +#: netbox/users/forms/filtersets.py:68 netbox/users/forms/model_forms.py:313 msgid "Actions" msgstr "" @@ -13104,7 +13104,7 @@ msgid "View" msgstr "" #: netbox/templates/users/objectpermission.html:52 -#: netbox/users/forms/model_forms.py:312 +#: netbox/users/forms/model_forms.py:316 msgid "Constraints" msgstr "" @@ -13623,30 +13623,30 @@ msgstr "" msgid "Passwords do not match! Please check your input and try again." msgstr "" -#: netbox/users/forms/model_forms.py:291 +#: netbox/users/forms/model_forms.py:295 msgid "Additional actions" msgstr "" -#: netbox/users/forms/model_forms.py:294 +#: netbox/users/forms/model_forms.py:298 msgid "Actions granted in addition to those listed above" msgstr "" -#: netbox/users/forms/model_forms.py:310 +#: netbox/users/forms/model_forms.py:314 msgid "Objects" msgstr "" -#: netbox/users/forms/model_forms.py:322 +#: netbox/users/forms/model_forms.py:326 msgid "" "JSON expression of a queryset filter that will return only permitted " "objects. Leave null to match all objects of this type. A list of multiple " "objects will result in a logical OR operation." msgstr "" -#: netbox/users/forms/model_forms.py:361 +#: netbox/users/forms/model_forms.py:365 msgid "At least one action must be selected." msgstr "" -#: netbox/users/forms/model_forms.py:379 +#: netbox/users/forms/model_forms.py:383 #, python-brace-format msgid "Invalid filter for {model}: {error}" msgstr ""