NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-28 03:16:25 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'netbox-community:main' into 17686-config_option_for_disk_divider

Browse Source
This commit is contained in:
Mika Busch 2025-02-10 09:56:37 +01:00 committed by GitHub
commit 6caf957158
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/development/style-guide.md
View File

@ -22,7 +22,7 @@ NetBox generally follows the [Django style guide](https://docs.djangoproject.com
### Linting
The [ruff](https://docs.astral.sh/ruff/) linter is used to enforce code style. A [pre-commit hook](./getting-started.md#3-enable-pre-commit-hooks) which runs this automatically is included with NetBox. To invoke `ruff` manually, run:
The [ruff](https://docs.astral.sh/ruff/) linter is used to enforce code style, and is run automatically by [pre-commit](./getting-started.md#5-install-pre-commit). To invoke `ruff` manually, run:
```
ruff check netbox/

2
mkdocs.yml
View File

@ -64,6 +64,8 @@ markdown_extensions:
format: !!python/name:pymdownx.superfences.fence_code_format
- pymdownx.tabbed:
alternate_style: true
not_in_nav: |
/index.md
nav:
- Introduction: 'introduction.md'
- Features:

18
netbox/translations/en/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-02-07 05:01+0000\n"
"POT-Creation-Date: 2025-02-08 05:02+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -87,7 +87,7 @@ msgstr ""
#: netbox/dcim/choices.py:237 netbox/dcim/choices.py:1534
#: netbox/dcim/choices.py:1592 netbox/dcim/choices.py:1642
#: netbox/dcim/choices.py:1664 netbox/virtualization/choices.py:20
#: netbox/virtualization/choices.py:45 netbox/vpn/choices.py:18
#: netbox/virtualization/choices.py:46 netbox/vpn/choices.py:18
msgid "Planned"
msgstr ""
@ -104,7 +104,7 @@ msgstr ""
#: netbox/ipam/choices.py:69 netbox/ipam/choices.py:154
#: netbox/templates/extras/configcontext.html:25
#: netbox/templates/users/user.html:37 netbox/users/forms/bulk_edit.py:38
#: netbox/virtualization/choices.py:22 netbox/virtualization/choices.py:44
#: netbox/virtualization/choices.py:22 netbox/virtualization/choices.py:45
#: netbox/vpn/choices.py:19 netbox/wireless/choices.py:25
msgid "Active"
msgstr ""
@ -112,7 +112,7 @@ msgstr ""
#: netbox/circuits/choices.py:24 netbox/dcim/choices.py:183
#: netbox/dcim/choices.py:235 netbox/dcim/choices.py:1590
#: netbox/dcim/choices.py:1643 netbox/dcim/choices.py:1662
#: netbox/virtualization/choices.py:24 netbox/virtualization/choices.py:43
#: netbox/virtualization/choices.py:24 netbox/virtualization/choices.py:44
msgid "Offline"
msgstr ""
@ -2007,7 +2007,7 @@ msgstr ""
#: netbox/core/constants.py:20 netbox/core/tables/tasks.py:34
#: netbox/dcim/choices.py:187 netbox/dcim/choices.py:239
#: netbox/dcim/choices.py:1593 netbox/dcim/choices.py:1666
#: netbox/virtualization/choices.py:47
#: netbox/virtualization/choices.py:48
msgid "Failed"
msgstr ""
@ -2920,7 +2920,7 @@ msgstr ""
#: netbox/dcim/choices.py:23 netbox/dcim/choices.py:189
#: netbox/dcim/choices.py:240 netbox/dcim/choices.py:1535
#: netbox/dcim/choices.py:1667 netbox/virtualization/choices.py:23
#: netbox/virtualization/choices.py:48
#: netbox/virtualization/choices.py:49
msgid "Decommissioning"
msgstr ""
@ -3052,7 +3052,7 @@ msgid "Rear"
msgstr ""
#: netbox/dcim/choices.py:186 netbox/dcim/choices.py:238
#: netbox/dcim/choices.py:1665 netbox/virtualization/choices.py:46
#: netbox/dcim/choices.py:1665 netbox/virtualization/choices.py:47
msgid "Staged"
msgstr ""
@ -15487,6 +15487,10 @@ msgid ""
"be used on views which define a base queryset"
msgstr ""
#: netbox/virtualization/choices.py:50
msgid "Paused"
msgstr ""
#: netbox/virtualization/filtersets.py:45
msgid "Parent group (ID)"
msgstr ""

2
netbox/virtualization/choices.py
View File

@ -38,6 +38,7 @@ class VirtualMachineStatusChoices(ChoiceSet):
STATUS_STAGED = 'staged'
STATUS_FAILED = 'failed'
STATUS_DECOMMISSIONING = 'decommissioning'
STATUS_PAUSED = 'paused'
CHOICES = [
(STATUS_OFFLINE, _('Offline'), 'gray'),
@ -46,4 +47,5 @@ class VirtualMachineStatusChoices(ChoiceSet):
(STATUS_STAGED, _('Staged'), 'blue'),
(STATUS_FAILED, _('Failed'), 'red'),
(STATUS_DECOMMISSIONING, _('Decommissioning'), 'yellow'),
(STATUS_PAUSED, _('Paused'), 'orange'),
]