mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'develop-2.9' into 2006-scripts-reports-background

Browse Source
This commit is contained in:
Jeremy Stretch
2020-07-02 11:00:59 -04:00
committed by GitHub
parent 1d922a1848 8d7377ba04
commit f98fa364c0
144 changed files with 4747 additions and 3590 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/extras/models/models.py
View File

@@ -540,7 +540,7 @@ class ConfigContextModel(models.Model):
# Compile all config data, overwriting lower-weight values with higher-weight values where a collision occurs
data = OrderedDict()
for context in ConfigContext.objects.get_for_object(self):
for context in ConfigContext.objects.unrestricted().get_for_object(self):
data = deepmerge(data, context.data)
# If the object has local config context data defined, merge it last

6
netbox/extras/models/tags.py
View File

@@ -22,14 +22,10 @@ class Tag(TagBase, ChangeLoggedModel):
blank=True,
)
objects = models.Manager()
restricted = RestrictedQuerySet.as_manager()
objects = RestrictedQuerySet.as_manager()
csv_headers = ['name', 'slug', 'color', 'description']
def get_absolute_url(self):
return reverse('extras:tag', args=[self.slug])
def slugify(self, tag, i=None):
# Allow Unicode in Tag slugs (avoids empty slugs for Tags with all-Unicode names)
slug = slugify(tag, allow_unicode=True)