@@ -13,11 +13,16 class JARSConfigurationForm(forms.ModelForm): | |||||
13 | if instance.experiment: |
|
13 | if instance.experiment: | |
14 | self.fields['experiment'].widget.attrs['disabled'] = 'disabled' |
|
14 | self.fields['experiment'].widget.attrs['disabled'] = 'disabled' | |
15 |
|
15 | |||
16 | #self.fields['experiment'].widget.attrs['readonly'] = True |
|
|||
17 | #self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)] |
|
|||
18 |
|
||||
19 | self.fields['device'].widget.choices = [(device.id, device) for device in devices] |
|
16 | self.fields['device'].widget.choices = [(device.id, device) for device in devices] | |
20 |
|
17 | |||
|
18 | #-------------JARS Configuration needs an Experiment----------------- | |||
|
19 | def clean(self): | |||
|
20 | cleaned_data = super(JARSConfigurationForm, self).clean() | |||
|
21 | experiment = cleaned_data.get("experiment") | |||
|
22 | if experiment == None: | |||
|
23 | msg = "Jars Configuration needs an Experiment." | |||
|
24 | self.add_error('experiment', msg) | |||
|
25 | ||||
21 | class Meta: |
|
26 | class Meta: | |
22 | model = JARSConfiguration |
|
27 | model = JARSConfiguration | |
23 | exclude = ('type', 'parameters', 'status') |
|
28 | exclude = ('type', 'parameters', 'status') |
@@ -862,7 +862,7 def dev_conf_new(request, id_exp=0, id_dev=0): | |||||
862 | DevConfForm = CONF_FORMS[device.device_type.name] |
|
862 | DevConfForm = CONF_FORMS[device.device_type.name] | |
863 |
|
863 | |||
864 | form = DevConfForm(request.POST) |
|
864 | form = DevConfForm(request.POST) | |
865 |
|
865 | kwargs['button'] = 'Create' | ||
866 | if form.is_valid(): |
|
866 | if form.is_valid(): | |
867 | conf = form.save() |
|
867 | conf = form.save() | |
868 |
|
868 |
General Comments 0
You need to be logged in to leave comments.
Login now