radarsys Commit - r308:4f3abdc3b0dc · Jicamarca Repository

JARS model experiment is optional

Juan C. Espinoza -

r308:4f3abdc3b0dc

parent child

Context file:

r308:4f3abdc3b0dc

Collapse all files

apps/jars/forms.py +9 -9

                      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()
                      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

apps/jars/models.py +1 -1

                          return False
                      json_data = json.dumps(data)
-                     print json_data
                      try:
                          payload = self.request('write', 'post', json=json_data)
                          self.device.status = payload['status']

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages