From 1518463e2fc16f940877b49d4505dead5c445c47 2016-05-05 15:02:50
From: Fiorella Quino <fiorella.quino@jro.igp.gob.pe>
Date: 2016-05-05 15:02:50
Subject: [PATCH] Task #99: Modulo web del JARS + kwargs['button'] (main)

git-svn-id: http://jro-dev.igp.gob.pe/svn/jro_hard/radarsys/trunk/webapp@143 aa17d016-51d5-4e8b-934c-7b2bbb1bbe71

---

diff --git a/apps/jars/forms.py b/apps/jars/forms.py
index 8132e1a..67d0984 100644
--- a/apps/jars/forms.py
+++ b/apps/jars/forms.py
@@ -13,11 +13,16 @@ class JARSConfigurationForm(forms.ModelForm):
             if instance.experiment:
                 self.fields['experiment'].widget.attrs['disabled'] = 'disabled'
             
-            #self.fields['experiment'].widget.attrs['readonly'] = True
-            #self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
-            
             self.fields['device'].widget.choices = [(device.id, device) for device in devices]
             
+    #-------------JARS Configuration needs an Experiment-----------------
+    def clean(self):
+        cleaned_data = super(JARSConfigurationForm, self).clean()
+        experiment = cleaned_data.get("experiment")
+        if experiment == None:
+            msg = "Jars Configuration needs an Experiment."
+            self.add_error('experiment', msg)
+
     class Meta:
         model = JARSConfiguration
         exclude = ('type', 'parameters', 'status')
diff --git a/apps/main/views.py b/apps/main/views.py
index c8a7819..01a989f 100644
--- a/apps/main/views.py
+++ b/apps/main/views.py
@@ -862,7 +862,7 @@ def dev_conf_new(request, id_exp=0, id_dev=0):
         DevConfForm = CONF_FORMS[device.device_type.name]
                                         
         form = DevConfForm(request.POST)
-        
+        kwargs['button'] = 'Create'
         if form.is_valid():
             conf = form.save()