mirror of
https://github.com/netbox-community/netbox.git
synced 2026-01-24 20:39:59 -06:00
Compare commits
1 Commits
21254-attr
...
21202-scop
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6ca82a0901 |
@@ -75,7 +75,7 @@ class ScopedForm(forms.Form):
|
|||||||
except ObjectDoesNotExist:
|
except ObjectDoesNotExist:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if self.instance and scope_type_id != self.instance.scope_type_id:
|
if self.instance and self.instance.pk and scope_type_id != self.instance.scope_type_id:
|
||||||
self.initial['scope'] = None
|
self.initial['scope'] = None
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -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 = {
|
||||||
|
|||||||
@@ -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):
|
||||||
|
|||||||
Reference in New Issue
Block a user