mirror of
https://github.com/netbox-community/netbox.git
synced 2026-01-24 12:32:42 -06:00
Compare commits
1 Commits
21254-attr
...
21176-remo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cedbeb7b19 |
@@ -86,7 +86,7 @@ def enqueue_event(queue, instance, request, event_type):
|
|||||||
|
|
||||||
|
|
||||||
def process_event_rules(event_rules, object_type, event_type, data, username=None, snapshots=None, request=None):
|
def process_event_rules(event_rules, object_type, event_type, data, username=None, snapshots=None, request=None):
|
||||||
user = None # To be resolved from the username if needed
|
user = User.objects.get(username=username) if username else None
|
||||||
|
|
||||||
for event_rule in event_rules:
|
for event_rule in event_rules:
|
||||||
|
|
||||||
@@ -134,10 +134,6 @@ def process_event_rules(event_rules, object_type, event_type, data, username=Non
|
|||||||
# Resolve the script from action parameters
|
# Resolve the script from action parameters
|
||||||
script = event_rule.action_object.python_class()
|
script = event_rule.action_object.python_class()
|
||||||
|
|
||||||
# Retrieve the User if not already resolved
|
|
||||||
if user is None:
|
|
||||||
user = User.objects.get(username=username)
|
|
||||||
|
|
||||||
# Enqueue a Job to record the script's execution
|
# Enqueue a Job to record the script's execution
|
||||||
from extras.jobs import ScriptJob
|
from extras.jobs import ScriptJob
|
||||||
params = {
|
params = {
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ IMAGEATTACHMENT_IMAGE = """
|
|||||||
<a href="{{ record.image.url }}" target="_blank" class="image-preview" data-bs-placement="top">
|
<a href="{{ record.image.url }}" target="_blank" class="image-preview" data-bs-placement="top">
|
||||||
<i class="mdi mdi-image"></i></a>
|
<i class="mdi mdi-image"></i></a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<a href="{{ record.get_absolute_url }}">{{ record.filename|truncate_middle:16 }}</a>
|
<a href="{{ record.get_absolute_url }}">{{ record }}</a>
|
||||||
"""
|
"""
|
||||||
|
|
||||||
NOTIFICATION_ICON = """
|
NOTIFICATION_ICON = """
|
||||||
|
|||||||
@@ -370,6 +370,11 @@ class AnnotatedIPAddressTable(IPAddressTable):
|
|||||||
verbose_name=_('IP Address')
|
verbose_name=_('IP Address')
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def render_pk(self, value, record, bound_column):
|
||||||
|
if type(record) is not self._meta.model:
|
||||||
|
return ''
|
||||||
|
return bound_column.column.render(value, bound_column, record)
|
||||||
|
|
||||||
class Meta(IPAddressTable.Meta):
|
class Meta(IPAddressTable.Meta):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
41
netbox/ipam/tests/test_tables.py
Normal file
41
netbox/ipam/tests/test_tables.py
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
from django.test import RequestFactory, TestCase
|
||||||
|
from netaddr import IPNetwork
|
||||||
|
|
||||||
|
from ipam.models import IPAddress, IPRange, Prefix
|
||||||
|
from ipam.tables import AnnotatedIPAddressTable
|
||||||
|
from ipam.utils import annotate_ip_space
|
||||||
|
|
||||||
|
|
||||||
|
class AnnotatedIPAddressTableTest(TestCase):
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def setUpTestData(cls):
|
||||||
|
cls.prefix = Prefix.objects.create(
|
||||||
|
prefix=IPNetwork('10.1.1.0/24'),
|
||||||
|
status='active'
|
||||||
|
)
|
||||||
|
|
||||||
|
cls.ip_address = IPAddress.objects.create(
|
||||||
|
address='10.1.1.1/24',
|
||||||
|
status='active'
|
||||||
|
)
|
||||||
|
|
||||||
|
cls.ip_range = IPRange.objects.create(
|
||||||
|
start_address=IPNetwork('10.1.1.2/24'),
|
||||||
|
end_address=IPNetwork('10.1.1.10/24'),
|
||||||
|
status='active'
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_ipaddress_has_checkbox_iprange_does_not(self):
|
||||||
|
data = annotate_ip_space(self.prefix)
|
||||||
|
table = AnnotatedIPAddressTable(data, orderable=False)
|
||||||
|
table.columns.show('pk')
|
||||||
|
|
||||||
|
request = RequestFactory().get('/')
|
||||||
|
html = table.as_html(request)
|
||||||
|
|
||||||
|
ipaddress_checkbox_count = html.count(f'name="pk" value="{self.ip_address.pk}"')
|
||||||
|
self.assertEqual(ipaddress_checkbox_count, 1)
|
||||||
|
|
||||||
|
iprange_checkbox_count = html.count(f'name="pk" value="{self.ip_range.pk}"')
|
||||||
|
self.assertEqual(iprange_checkbox_count, 0)
|
||||||
@@ -49,6 +49,9 @@ def add_requested_prefixes(parent, prefix_list, show_available=True, show_assign
|
|||||||
if prefix_list and show_available:
|
if prefix_list and show_available:
|
||||||
|
|
||||||
# Find all unallocated space, add fake Prefix objects to child_prefixes.
|
# Find all unallocated space, add fake Prefix objects to child_prefixes.
|
||||||
|
# IMPORTANT: These are unsaved Prefix instances (pk=None). If this is ever changed to use
|
||||||
|
# saved Prefix instances with real pks, bulk delete will fail for mixed-type selections
|
||||||
|
# due to single-model form validation. See: https://github.com/netbox-community/netbox/issues/21176
|
||||||
available_prefixes = netaddr.IPSet(parent) ^ netaddr.IPSet([p.prefix for p in prefix_list])
|
available_prefixes = netaddr.IPSet(parent) ^ netaddr.IPSet([p.prefix for p in prefix_list])
|
||||||
available_prefixes = [Prefix(prefix=p, status=None) for p in available_prefixes.iter_cidrs()]
|
available_prefixes = [Prefix(prefix=p, status=None) for p in available_prefixes.iter_cidrs()]
|
||||||
child_prefixes = child_prefixes + available_prefixes
|
child_prefixes = child_prefixes + available_prefixes
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import re
|
import re
|
||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
import logging
|
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
@@ -29,8 +28,6 @@ __all__ = (
|
|||||||
'SearchView',
|
'SearchView',
|
||||||
)
|
)
|
||||||
|
|
||||||
logger = logging.getLogger(f'netbox.{__name__}')
|
|
||||||
|
|
||||||
Link = namedtuple('Link', ('label', 'viewname', 'permission', 'count'))
|
Link = namedtuple('Link', ('label', 'viewname', 'permission', 'count'))
|
||||||
|
|
||||||
|
|
||||||
@@ -53,14 +50,7 @@ class HomeView(ConditionalLoginRequiredMixin, View):
|
|||||||
# Check whether a new release is available. (Only for superusers.)
|
# Check whether a new release is available. (Only for superusers.)
|
||||||
new_release = None
|
new_release = None
|
||||||
if request.user.is_superuser:
|
if request.user.is_superuser:
|
||||||
# cache.get() can raise if the cached value can't be unpickled after dependency upgrades
|
latest_release = cache.get('latest_release')
|
||||||
try:
|
|
||||||
latest_release = cache.get('latest_release')
|
|
||||||
except Exception:
|
|
||||||
logger.debug("Failed to read 'latest_release' from cache; deleting key", exc_info=True)
|
|
||||||
cache.delete('latest_release')
|
|
||||||
latest_release = None
|
|
||||||
|
|
||||||
if latest_release:
|
if latest_release:
|
||||||
release_version, release_url = latest_release
|
release_version, release_url = latest_release
|
||||||
if release_version > version.parse(settings.RELEASE.version):
|
if release_version > version.parse(settings.RELEASE.version):
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: PACKAGE VERSION\n"
|
"Project-Id-Version: PACKAGE VERSION\n"
|
||||||
"Report-Msgid-Bugs-To: \n"
|
"Report-Msgid-Bugs-To: \n"
|
||||||
"POT-Creation-Date: 2026-01-22 05:07+0000\n"
|
"POT-Creation-Date: 2026-01-21 05:07+0000\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
@@ -12037,7 +12037,7 @@ msgstr ""
|
|||||||
msgid "date synced"
|
msgid "date synced"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: netbox/netbox/models/features.py:621
|
#: netbox/netbox/models/features.py:623
|
||||||
#, python-brace-format
|
#, python-brace-format
|
||||||
msgid "{class_name} must implement a sync_data() method."
|
msgid "{class_name} must implement a sync_data() method."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
@@ -13935,8 +13935,8 @@ msgid "No VLANs Assigned"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: netbox/templates/dcim/inc/interface_vlans_table.html:44
|
#: netbox/templates/dcim/inc/interface_vlans_table.html:44
|
||||||
#: netbox/templates/ipam/inc/max_depth.html:11
|
#: netbox/templates/ipam/prefix_list.html:16
|
||||||
#: netbox/templates/ipam/inc/max_length.html:11
|
#: netbox/templates/ipam/prefix_list.html:33
|
||||||
msgid "Clear"
|
msgid "Clear"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
@@ -15053,8 +15053,8 @@ msgstr ""
|
|||||||
msgid "Date Added"
|
msgid "Date Added"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: netbox/templates/ipam/aggregate/prefixes.html:10
|
#: netbox/templates/ipam/aggregate/prefixes.html:8
|
||||||
#: netbox/templates/ipam/prefix/prefixes.html:10
|
#: netbox/templates/ipam/prefix/prefixes.html:8
|
||||||
#: netbox/templates/ipam/role.html:10
|
#: netbox/templates/ipam/role.html:10
|
||||||
msgid "Add Prefix"
|
msgid "Add Prefix"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
@@ -15083,14 +15083,6 @@ msgstr ""
|
|||||||
msgid "Bulk Create"
|
msgid "Bulk Create"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: netbox/templates/ipam/inc/max_depth.html:6
|
|
||||||
msgid "Max Depth"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: netbox/templates/ipam/inc/max_length.html:6
|
|
||||||
msgid "Max Length"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: netbox/templates/ipam/inc/panels/fhrp_groups.html:10
|
#: netbox/templates/ipam/inc/panels/fhrp_groups.html:10
|
||||||
msgid "Create Group"
|
msgid "Create Group"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
@@ -15192,6 +15184,14 @@ msgstr ""
|
|||||||
msgid "Hide Depth Indicators"
|
msgid "Hide Depth Indicators"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: netbox/templates/ipam/prefix_list.html:11
|
||||||
|
msgid "Max Depth"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
#: netbox/templates/ipam/prefix_list.html:28
|
||||||
|
msgid "Max Length"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: netbox/templates/ipam/rir.html:10
|
#: netbox/templates/ipam/rir.html:10
|
||||||
msgid "Add Aggregate"
|
msgid "Add Aggregate"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|||||||
@@ -252,16 +252,3 @@ def isodatetime(value, spec='seconds'):
|
|||||||
else:
|
else:
|
||||||
return ''
|
return ''
|
||||||
return mark_safe(f'<span title="{naturaltime(value)}">{text}</span>')
|
return mark_safe(f'<span title="{naturaltime(value)}">{text}</span>')
|
||||||
|
|
||||||
|
|
||||||
@register.filter
|
|
||||||
def truncate_middle(value, length):
|
|
||||||
if len(value) <= length:
|
|
||||||
return value
|
|
||||||
|
|
||||||
# Calculate split points for the two parts
|
|
||||||
half_len = (length - 1) // 2 # 1 for the ellipsis
|
|
||||||
first_part = value[:half_len]
|
|
||||||
second_part = value[len(value) - (length - 1 - half_len):]
|
|
||||||
|
|
||||||
return mark_safe(f"{first_part}…{second_part}")
|
|
||||||
|
|||||||
Reference in New Issue
Block a user