##// END OF EJS Templates
Fix bug in dds forms, when experiment is not none...
Juan C. Espinoza -
r80:ab8ef2984a03
parent child
Show More
@@ -1,31 +1,29
1 from django import forms
1 from django import forms
2 from apps.main.models import Device
2 from apps.main.models import Device
3 from .models import DDSConfiguration
3 from .models import DDSConfiguration
4
4
5 # from django.core.validators import MinValueValidator, MaxValueValidator
5 # from django.core.validators import MinValueValidator, MaxValueValidator
6
6
7 class DDSConfigurationForm(forms.ModelForm):
7 class DDSConfigurationForm(forms.ModelForm):
8
8
9 def __init__(self, *args, **kwargs):
9 def __init__(self, *args, **kwargs):
10 #request = kwargs.pop('request')
10 #request = kwargs.pop('request')
11 super(DDSConfigurationForm, self).__init__(*args, **kwargs)
11 super(DDSConfigurationForm, self).__init__(*args, **kwargs)
12
12
13 instance = getattr(self, 'instance', None)
13 instance = getattr(self, 'instance', None)
14
14
15 if instance and instance.pk:
15 if instance and instance.pk:
16
16
17 devices = Device.objects.filter(device_type__name='dds')
17 devices = Device.objects.filter(device_type__name='dds')
18
18
19 self.fields['experiment'].widget.attrs['readonly'] = True
19 self.fields['experiment'].widget.attrs['readonly'] = True
20 self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
20
21 if instance.experiment is not None:
22 self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
21
23
22 self.fields['device'].widget.choices = [(device.id, device) for device in devices]
24 self.fields['device'].widget.choices = [(device.id, device) for device in devices]
23
25
24 #
25 # def clean(self):
26 # # Custom validation to force an integer when type of unit = "Unit"
27 # return
28
26
29 class Meta:
27 class Meta:
30 model = DDSConfiguration
28 model = DDSConfiguration
31 exclude = ('type', 'parameters', 'status') No newline at end of file
29 exclude = ('type', 'parameters', 'status')
General Comments 0
You need to be logged in to leave comments. Login now