arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

FIX: pep8/remove debug print

Browse Source
This commit is contained in:
FreneticScribbler
2020-02-18 18:37:54 +00:00
parent d1ccb561f5
commit e7324e2d10
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
assets/forms.py
View File

@@ -45,8 +45,7 @@ class CableTypeForm(forms.ModelForm):
def clean(self): def clean(self):
form_data = self.cleaned_data form_data = self.cleaned_data
queryset = models.CableType.objects.filter(Q(plug=form_data['plug']) & Q(socket=form_data['socket']) & Q(circuits=form_data['circuits']) & Q(cores=form_data['cores'])) queryset = models.CableType.objects.filter(Q(plug=form_data['plug']) & Q(socket=form_data['socket']) & Q(circuits=form_data['circuits']) & Q(cores=form_data['cores']))
# Being identical to itself doesn't count... # Being identical to itself shouldn't count...
print(self.instance.id)
if queryset.exists() and self.instance.pk != queryset[0].pk: if queryset.exists() and self.instance.pk != queryset[0].pk:
raise forms.ValidationError("A cable type that exactly matches this one already exists, please use that instead.", code="notunique") raise forms.ValidationError("A cable type that exactly matches this one already exists, please use that instead.", code="notunique")
return form_data return form_data

3
assets/models.py
View File

@@ -78,7 +78,7 @@ class CableType(models.Model):
related_name='socket', blank=True, null=True) related_name='socket', blank=True, null=True)
def __str__(self): def __str__(self):
return "%s → %s" % (self.plug.description, self.socket.description) return "%s → %s" % (self.plug.description, self.socket.description)
@reversion.register @reversion.register
@@ -113,7 +113,6 @@ class Asset(models.Model, RevisionMixin):
csa = models.DecimalField(decimal_places=2, max_digits=10, csa = models.DecimalField(decimal_places=2, max_digits=10,
blank=True, null=True, help_text='mm^2') blank=True, null=True, help_text='mm^2')
# Hidden asset_id components # Hidden asset_id components
# For example, if asset_id was "C1001" then asset_id_prefix would be "C" and number "1001" # For example, if asset_id was "C1001" then asset_id_prefix would be "C" and number "1001"
asset_id_prefix = models.CharField(max_length=8, default="") asset_id_prefix = models.CharField(max_length=8, default="")

5
assets/views.py
View File

@@ -278,7 +278,8 @@ class CableTypeCreate(generic.CreateView):
return context return context
def get_success_url(self): def get_success_url(self):
return reverse("cable_type_detail", kwargs={"pk": self.object.pk }) return reverse("cable_type_detail", kwargs={"pk": self.object.pk})
class CableTypeUpdate(generic.UpdateView): class CableTypeUpdate(generic.UpdateView):
model = models.CableType model = models.CableType
@@ -292,4 +293,4 @@ class CableTypeUpdate(generic.UpdateView):
return context return context
def get_success_url(self): def get_success_url(self):
return reverse("cable_type_detail", kwargs={"pk": self.object.pk }) return reverse("cable_type_detail", kwargs={"pk": self.object.pk})