Basic validation done on forms

gnowgi · Jan 23, 2012 · 1003b68 · 1003b68
1 parent 8ba2be9
commit 1003b68
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 30 deletions.
diff --git a/gstudio/forms.py b/gstudio/forms.py
@@ -7,6 +7,13 @@ class Meta:
         model = Metatype
 
 class ObjecttypeForm(ModelForm):                 
+    def clean(self):
+        CleanedData = self.cleaned_data
+        title = CleanedData.get('title')
+        if title == "":
+            raise forms.ValidationError("Title should no ")
+        return CleanedData
+
 
     class Meta:
         model = Objecttype

diff --git a/gstudio/templates/gstudioforms/gstudioattributeform.html b/gstudio/templates/gstudioforms/gstudioattributeform.html
@@ -6,9 +6,10 @@
 {% csrf_token %}  
 <h2>Form to add attributes</h2>
 {% for field in formset %}
-     {{ field.errors }}<br>
+
      {{ field.label_tag }}:{{ field }}<br>
      {{field.help_text}}<br>
+     {{ field.errors }}<br>
 
 
 {% endfor %}

diff --git a/gstudio/templates/gstudioforms/gstudioattributetypeform.html b/gstudio/templates/gstudioforms/gstudioattributetypeform.html
@@ -6,9 +6,10 @@
 {% csrf_token %}  
 <h2>Form to add Attributetypes</h2>
 {% for field in formset %}
-     {{ field.errors }}<br>
+
      {{ field.label_tag }}:{{ field }}<br>
      {{field.help_text}}<br>
+     {{ field.errors }}<br>
 
 
 {% endfor %}

diff --git a/gstudio/templates/gstudioforms/gstudiometatypeform.html b/gstudio/templates/gstudioforms/gstudiometatypeform.html
@@ -5,7 +5,15 @@
 <form method="post" action=".">
 {% csrf_token %}  
 <h2>Form to add Metatypes</h2>
-{{formset.as_p}}
+{% for field in formset %}
+
+     {{ field.label_tag }}:{{ field }}<br>
+     {{field.help_text}}<br>
+     {{ field.errors }}<br>
+
+
+{% endfor %}
+
 
   <input type="Submit" value="{% trans 'ADD' %}" />
   <input type="hidden" name="next" value="{{ next }}" />

diff --git a/gstudio/templates/gstudioforms/gstudioobjecttypeform.html b/gstudio/templates/gstudioforms/gstudioobjecttypeform.html
@@ -6,9 +6,10 @@
 {% csrf_token %}  
 <h2>Form to add Objecttypes</h2>
 {% for field in formset %}
-     {{ field.errors }}<br>
+
      {{ field.label_tag }}:{{ field }}<br>
      {{field.help_text}}<br>
+     {{ field.errors }}<br>
 
 
 {% endfor %}

diff --git a/gstudio/templates/gstudioforms/gstudioprocesstypeform.html b/gstudio/templates/gstudioforms/gstudioprocesstypeform.html
@@ -6,9 +6,10 @@
 {% csrf_token %}  
 <h2>Form to add Processtypes</h2>
 {% for field in formset %}
-     {{ field.errors }}<br>
+
      {{ field.label_tag }}:{{ field }}<br>
      {{field.help_text}}<br>
+     {{ field.errors }}<br>
 
 {% endfor %}
 

diff --git a/gstudio/templates/gstudioforms/gstudiorelationtypeform.html b/gstudio/templates/gstudioforms/gstudiorelationtypeform.html
@@ -6,9 +6,10 @@
 {% csrf_token %}  
 <h2>Form to add Relationtypes</h2>
 {% for field in formset %}
-     {{ field.errors }}<br>
+
      {{ field.label_tag }}:{{ field }}<br>
      {{field.help_text}}<br>
+     {{ field.errors }}<br>
 
 {% endfor %}
 

diff --git a/gstudio/templates/gstudioforms/gstudiosystemtypeform.html b/gstudio/templates/gstudioforms/gstudiosystemtypeform.html
@@ -4,11 +4,12 @@
 {% block content %}
 <form method="post" action=".">
 {% csrf_token %}  
-<h2>Form to add Systemtypetypes</h2>
+<h2>Form to add Systemtypes</h2>
 {% for field in formset %}
-     {{ field.errors }}<br>
+
      {{ field.label_tag }}:{{ field }}<br>
      {{field.help_text}}<br>
+     {{ field.errors }}<br>
 
 
 {% endfor %}

diff --git a/gstudio/views/add.py b/gstudio/views/add.py
@@ -5,7 +5,7 @@
 from django.shortcuts import render_to_response
 from datetime import datetime
 from gstudio.forms import *
-from django.core.exceptions import ValidationError
+
 
 def addmetatype(request):
     if request.method == 'POST':
@@ -19,9 +19,11 @@ def addmetatype(request):
     else:
 
         formset = MetatypeForm()
-        variables = RequestContext(request,{'formset':formset})
-        template = "gstudioforms/gstudiometatypeform.html"
-        return render_to_response(template, variables)
+
+
+    variables = RequestContext(request,{'formset':formset})
+    template = "gstudioforms/gstudiometatypeform.html"
+    return render_to_response(template, variables)
 
 
 
@@ -31,15 +33,16 @@ def addobjecttype(request):
             if formset.is_valid():
                 formset.save()
                 return HttpResponseRedirect("/gstudio/")
+
 
 
         else:
 
             formset = ObjecttypeForm()
 
-            template = "gstudioforms/gstudioobjecttypeform.html"
-            variables = RequestContext(request,{'formset':formset})
-            return render_to_response(template, variables)
+        template = "gstudioforms/gstudioobjecttypeform.html"
+        variables = RequestContext(request,{'formset':formset})
+        return render_to_response(template, variables)
 
 def addrelationtype(request):
         if request.method == 'POST':
@@ -53,9 +56,9 @@ def addrelationtype(request):
 
             formset = RelationtypeForm()
 
-            template = "gstudioforms/gstudiorelationtypeform.html"
-            variables = RequestContext(request,{'formset':formset})
-            return render_to_response(template, variables)
+        template = "gstudioforms/gstudiorelationtypeform.html"
+        variables = RequestContext(request,{'formset':formset})
+        return render_to_response(template, variables)
 
 
 def addattributetype(request):
@@ -70,9 +73,9 @@ def addattributetype(request):
 
             formset = AttributetypeForm()
 
-            template = "gstudioforms/gstudioattributetypeform.html"
-            variables = RequestContext(request,{'formset':formset})
-            return render_to_response(template, variables)
+        template = "gstudioforms/gstudioattributetypeform.html"
+        variables = RequestContext(request,{'formset':formset})
+        return render_to_response(template, variables)
 
 
 def addsystemtype(request):
@@ -87,9 +90,9 @@ def addsystemtype(request):
 
             formset = SystemtypeForm()
 
-            template = "gstudioforms/gstudioattributetypeform.html"
-            variables = RequestContext(request,{'formset':formset})
-            return render_to_response(template, variables)
+        template = "gstudioforms/gstudiosystemtypeform.html"
+        variables = RequestContext(request,{'formset':formset})
+        return render_to_response(template, variables)
 
 def addprocesstype(request):
         if request.method == 'POST':
@@ -103,9 +106,9 @@ def addprocesstype(request):
 
             formset = ProcesstypeForm()
 
-            template = "gstudioforms/gstudioattributeform.html"
-            variables = RequestContext(request,{'formset':formset})
-            return render_to_response(template, variables)
+        template = "gstudioforms/gstudioprocesstypeform.html"
+        variables = RequestContext(request,{'formset':formset})
+        return render_to_response(template, variables)
 
 def addattribute(request):
         if request.method == 'POST':
@@ -119,9 +122,9 @@ def addattribute(request):
 
             formset = AttributeForm()
 
-            template = "gstudioforms/gstudioattributeform.html"
-            variables = RequestContext(request,{'formset':formset})
-            return render_to_response(template, variables)
+        template = "gstudioforms/gstudioattributeform.html"
+        variables = RequestContext(request,{'formset':formset})
+        return render_to_response(template, variables)