Merge branch 'master' into clean-out-computer-forms
This commit is contained in:
commit
afd1320a91
1
Makefile
1
Makefile
|
@ -3,6 +3,7 @@ SHELL=/bin/bash
|
|||
.PHONY: docker
|
||||
|
||||
docker:
|
||||
export DJANGO_SETTINGS_MODULE=network_inventory.settings.docker; \
|
||||
docker-compose up
|
||||
|
||||
test:
|
||||
|
|
|
@ -10,30 +10,6 @@ from .models import (
|
|||
)
|
||||
|
||||
|
||||
class BackupMethodAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class NotificationTypeAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class NotificationAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class TargetDeviceInLine(admin.StackedInline):
|
||||
model = TargetDevice
|
||||
extra = 0
|
||||
|
@ -50,16 +26,8 @@ class BackupAdmin(admin.ModelAdmin):
|
|||
inlines = (TargetDeviceInLine, NotificationForBackupInLine)
|
||||
|
||||
|
||||
class TargetDeviceAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
admin.site.register(Backup, BackupAdmin)
|
||||
admin.site.register(BackupMethod, BackupMethodAdmin)
|
||||
admin.site.register(Notification, NotificationAdmin)
|
||||
admin.site.register(NotificationType, NotificationTypeAdmin)
|
||||
admin.site.register(TargetDevice, TargetDeviceAdmin)
|
||||
admin.site.register(BackupMethod)
|
||||
admin.site.register(Notification)
|
||||
admin.site.register(NotificationType)
|
||||
admin.site.register(TargetDevice)
|
||||
|
|
|
@ -26,94 +26,6 @@ from .models import (
|
|||
)
|
||||
|
||||
|
||||
class CpuAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class CpuArchitectureAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class CpuManufacturerAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class GpuAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class GpuManufacturerAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class IpStatusAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class RamModuleAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class RaidTypeAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class DiskTypeAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class RamTypeAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class DiskInRaidAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class SoftwareInLine(nested_admin.NestedStackedInline):
|
||||
model = ComputerSoftwareRelation
|
||||
extra = 0
|
||||
|
@ -176,13 +88,13 @@ class ComputerAdmin(nested_admin.NestedModelAdmin):
|
|||
|
||||
|
||||
admin.site.register(Computer, ComputerAdmin)
|
||||
admin.site.register(Cpu, CpuAdmin)
|
||||
admin.site.register(CpuArchitecture, CpuArchitectureAdmin)
|
||||
admin.site.register(CpuManufacturer, CpuManufacturerAdmin)
|
||||
admin.site.register(Cpu)
|
||||
admin.site.register(CpuArchitecture)
|
||||
admin.site.register(CpuManufacturer)
|
||||
admin.site.register(Disk)
|
||||
admin.site.register(DiskType, DiskTypeAdmin)
|
||||
admin.site.register(Gpu, GpuAdmin)
|
||||
admin.site.register(GpuManufacturer, GpuManufacturerAdmin)
|
||||
admin.site.register(RaidType, RaidTypeAdmin)
|
||||
admin.site.register(Ram, RamModuleAdmin)
|
||||
admin.site.register(RamType, RamTypeAdmin)
|
||||
admin.site.register(DiskType)
|
||||
admin.site.register(Gpu)
|
||||
admin.site.register(GpuManufacturer)
|
||||
admin.site.register(RaidType)
|
||||
admin.site.register(Ram)
|
||||
admin.site.register(RamType)
|
||||
|
|
|
@ -12,52 +12,20 @@ from .models import (
|
|||
)
|
||||
|
||||
|
||||
class DeviceCategoryAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class DeviceManufacturerAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class HardwareModelAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class DeviceInNetInline(nested_admin.NestedStackedInline):
|
||||
model = DeviceInNet
|
||||
extra = 0
|
||||
verbose_name_plural = 'Nets'
|
||||
|
||||
|
||||
class WarrantyTypeAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class DeviceAdmin(nested_admin.NestedModelAdmin):
|
||||
inlines = (DeviceInNetInline, )
|
||||
|
||||
|
||||
admin.site.register(Device, DeviceAdmin)
|
||||
admin.site.register(DeviceCategory, DeviceCategoryAdmin)
|
||||
admin.site.register(DeviceCategory)
|
||||
admin.site.register(DeviceInNet)
|
||||
admin.site.register(DeviceManufacturer, DeviceManufacturerAdmin)
|
||||
admin.site.register(HardwareModel, HardwareModelAdmin)
|
||||
admin.site.register(DeviceManufacturer)
|
||||
admin.site.register(HardwareModel)
|
||||
admin.site.register(Warranty)
|
||||
admin.site.register(WarrantyType, WarrantyTypeAdmin)
|
||||
admin.site.register(WarrantyType)
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
from django.core.validators import RegexValidator
|
||||
from django.db import models
|
||||
from core.models import Category, Company
|
||||
from customers.models import Customer, Owner, Location
|
||||
|
@ -6,6 +7,13 @@ from nets.models import Net, IpStatus
|
|||
|
||||
|
||||
class DeviceManufacturer(Company):
|
||||
phone_regex = RegexValidator(
|
||||
regex=r'^\+?1?\d{9,15}$',
|
||||
message="Phone number must be entered in the format: '+999999999'. Up to 15 digits allowed.")
|
||||
phone_number = models.CharField(validators=[phone_regex], max_length=17,
|
||||
blank=True, null=True)
|
||||
email_address = models.EmailField(null=True, blank=True)
|
||||
website = models.URLField(null=True, blank=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name_plural = "Device Manufacturers"
|
||||
|
|
|
@ -9,22 +9,6 @@ from .models import (
|
|||
)
|
||||
|
||||
|
||||
class LicenseWithComputerAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class LicenseWithUserAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class UserLicenseAdmin(admin.ModelAdmin):
|
||||
model = UserLicense
|
||||
extra = 0
|
||||
|
@ -38,5 +22,5 @@ class ComputerLicenseAdmin(admin.ModelAdmin):
|
|||
|
||||
|
||||
admin.site.register(ComputerLicense, ComputerLicenseAdmin)
|
||||
admin.site.register(LicenseWithComputer, LicenseWithComputerAdmin)
|
||||
admin.site.register(LicenseWithComputer)
|
||||
admin.site.register(UserLicense, UserLicenseAdmin)
|
||||
|
|
|
@ -7,13 +7,5 @@ from .models import (
|
|||
)
|
||||
|
||||
|
||||
class IpStatusAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
admin.site.register(IpStatus, IpStatusAdmin)
|
||||
admin.site.register(IpStatus)
|
||||
admin.site.register(Net)
|
||||
|
|
|
@ -10,31 +10,7 @@ from .models import (
|
|||
)
|
||||
|
||||
|
||||
class OperatingSystemAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class SoftwareArchitectureAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class SoftwareCategoryAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
admin.site.register(OperatingSystem, OperatingSystemAdmin)
|
||||
admin.site.register(OperatingSystem)
|
||||
admin.site.register(Software)
|
||||
admin.site.register(SoftwareArchitecture, SoftwareArchitectureAdmin)
|
||||
admin.site.register(SoftwareCategory, SoftwareCategoryAdmin)
|
||||
admin.site.register(SoftwareArchitecture)
|
||||
admin.site.register(SoftwareCategory)
|
||||
|
|
|
@ -12,30 +12,6 @@ from .models import (
|
|||
)
|
||||
|
||||
|
||||
class MailAliasAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class UserInAdGroupAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class UserInMailGroupAdmin(admin.ModelAdmin):
|
||||
def get_model_perms(self, request):
|
||||
"""
|
||||
Return empty perms dict thus hiding the model from admin index.
|
||||
"""
|
||||
return {}
|
||||
|
||||
|
||||
class LicenseWithUserInLine(admin.StackedInline):
|
||||
model = LicenseWithUser
|
||||
extra = 0
|
||||
|
@ -69,8 +45,8 @@ class UserAdmin(admin.ModelAdmin):
|
|||
|
||||
|
||||
admin.site.register(AdGroup)
|
||||
admin.site.register(MailAlias, MailAliasAdmin)
|
||||
admin.site.register(MailAlias)
|
||||
admin.site.register(MailGroup)
|
||||
admin.site.register(User, UserAdmin)
|
||||
admin.site.register(UserInAdGroup, UserInAdGroupAdmin)
|
||||
admin.site.register(UserInMailGroup, UserInMailGroupAdmin)
|
||||
admin.site.register(UserInAdGroup)
|
||||
admin.site.register(UserInMailGroup)
|
||||
|
|
Loading…
Reference in New Issue