NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-25 08:46:10 -06:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Clean up user & group import

Browse Source
This commit is contained in:
Jeremy Stretch 2023-07-20 10:45:54 -04:00
parent 4702cc049f
commit 56cb542e1a
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
netbox/netbox/navigation/menu.py
View File

@ -368,6 +368,13 @@ ADMIN_MENU = Menu(
permissions=[f'auth.add_user'], permissions=[f'auth.add_user'],
color=ButtonColorChoices.GREEN color=ButtonColorChoices.GREEN
), ),
MenuItemButton(
link=f'users:netboxuser_import',
title='Import',
icon_class='mdi mdi-upload',
permissions=[f'auth.add_user'],
color=ButtonColorChoices.CYAN
)
) )
), ),
# Proxy model for auth.Group # Proxy model for auth.Group
@ -383,6 +390,13 @@ ADMIN_MENU = Menu(
permissions=[f'auth.add_group'], permissions=[f'auth.add_group'],
color=ButtonColorChoices.GREEN color=ButtonColorChoices.GREEN
), ),
MenuItemButton(
link=f'users:netboxgroup_import',
title='Import',
icon_class='mdi mdi-upload',
permissions=[f'auth.add_group'],
color=ButtonColorChoices.CYAN
)
) )
), ),
get_model_item('users', 'objectpermission', _('Permissions'), actions=['add']), get_model_item('users', 'objectpermission', _('Permissions'), actions=['add']),

13
netbox/users/forms/bulk_import.py
View File

@ -1,5 +1,3 @@
from django import forms
from users.models import NetBoxGroup, NetBoxUser from users.models import NetBoxGroup, NetBoxUser
from utilities.forms import CSVModelForm from utilities.forms import CSVModelForm
@ -28,12 +26,7 @@ class UserImportForm(CSVModelForm):
) )
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
edited = getattr(self, 'instance', None) # Set the hashed password
instance = super().save(*args, **kwargs) self.instance.set_password(self.cleaned_data.get('password'))
# On edit, check if we have to save the password return super().save(*args, **kwargs)
if edited and self.cleaned_data.get("password"):
instance.set_password(self.cleaned_data.get("password"))
instance.save()
return instance