diff --git a/apps/jars/forms.py b/apps/jars/forms.py index df81579..a3fc50f 100644 --- a/apps/jars/forms.py +++ b/apps/jars/forms.py @@ -21,9 +21,9 @@ class JARSConfigurationForm(forms.ModelForm): if instance and instance.pk: devices = Device.objects.filter(device_type__name='jars') - if instance.experiment: - experiments = Experiment.objects.filter(pk=instance.experiment.id) - self.fields['experiment'].widget.choices = [(experiment.id, experiment) for experiment in experiments] + #if instance.experiment: + # experiments = Experiment.objects.filter(pk=instance.experiment.id) + # self.fields['experiment'].widget.choices = [(experiment.id, experiment) for experiment in experiments] self.fields['device'].widget.choices = [(device.id, device) for device in devices] #self.fields['spectral'].widget = SpectralWidget() @@ -31,12 +31,12 @@ class JARSConfigurationForm(forms.ModelForm): self.fields['spectral'].widget = SpectralWidget() #-------------JARS Configuration needs an Experiment----------------- - def clean(self): - cleaned_data = super(JARSConfigurationForm, self).clean() - experiment = cleaned_data.get('experiment') - if not experiment: - msg = "Error: Jars Configuration needs an Experiment" - self.add_error('experiment', msg) + #def clean(self): + # cleaned_data = super(JARSConfigurationForm, self).clean() + # experiment = cleaned_data.get('experiment') + # if not experiment: + # msg = "Error: Jars Configuration needs an Experiment" + # self.add_error('experiment', msg) class Meta: model = JARSConfiguration diff --git a/apps/jars/models.py b/apps/jars/models.py index f648339..17f22af 100644 --- a/apps/jars/models.py +++ b/apps/jars/models.py @@ -273,7 +273,7 @@ class JARSConfiguration(Configuration): return False json_data = json.dumps(data) - print json_data + try: payload = self.request('write', 'post', json=json_data) self.device.status = payload['status']