arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-29 19:32:14 +00:00
Code Issues Projects Releases Wiki Activity

Attempt to fix odd deployment issue

Browse Source
This commit is contained in:
FreneticScribbler
2023-02-21 11:23:09 +00:00
parent a743d18dc9
commit 2871dcd281
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
assets/management/commands/generateSampleAssetsData.py
View File

@@ -105,8 +105,7 @@ class Command(BaseCommand):
for i in range(100): for i in range(100):
prefix = random.choice(asset_prefixes) prefix = random.choice(asset_prefixes)
asset_id = str(get_available_asset_id(wanted_prefix=prefix)) asset_id = get_available_asset_id(wanted_prefix=prefix)
asset_id = prefix + asset_id
asset = models.Asset( asset = models.Asset(
asset_id=asset_id, asset_id=asset_id,
description=random.choice(asset_description), description=random.choice(asset_description),

3
assets/models.py
View File

@@ -102,7 +102,8 @@ class AssetManager(models.Manager):
def get_available_asset_id(wanted_prefix=""): def get_available_asset_id(wanted_prefix=""):
last_asset = Asset.objects.filter(asset_id_prefix=wanted_prefix).last() last_asset = Asset.objects.filter(asset_id_prefix=wanted_prefix).last()
return 9000 if last_asset is None else wanted_prefix + str(last_asset.asset_id_number + 1) last_asset_id = last_asset.asset_id_number if last_asset else 0
return wanted_prefix + str(last_asset_id + 1)
def validate_positive(value): def validate_positive(value):

2
assets/views.py
View File

@@ -168,7 +168,7 @@ class DuplicateMixin:
class AssetDuplicate(DuplicateMixin, AssetIDUrlMixin, AssetCreate): class AssetDuplicate(DuplicateMixin, AssetIDUrlMixin, AssetCreate):
def get_initial(self, *args, **kwargs): def get_initial(self, *args, **kwargs):
initial = super().get_initial(*args, **kwargs) initial = super().get_initial(*args, **kwargs)
initial["asset_id"] = models.get_available_asset_id(wanted_prefix=self.get_object().asset_id_prefix) initial["asset_id"] = models.get_available_asset_id()
return initial return initial
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):