request: Add Model RequestField

Added a new model which holds data,that  needed for the editable form's fields.

circle/request/forms.py

@@ -16,7 +16,7 @@
 # with CIRCLE.  If not, see <http://www.gnu.org/licenses/>.
 from django.forms import (
     ModelForm, ModelChoiceField, ChoiceField, Form, CharField, RadioSelect,
-    Textarea, ValidationError
+    Textarea, ValidationError, TextInput,
 )
 from django.utils.translation import ugettext_lazy as _
 from django.template.loader import render_to_string
@@ -27,11 +27,29 @@ from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Submit
 
 from request.models import (
-    LeaseType, TemplateAccessType, TemplateAccessAction,
+    LeaseType, TemplateAccessType, TemplateAccessAction, RequestField
 )
 from dashboard.forms import VmResourcesForm
 
 
+class RequestFieldModelForm(ModelForm):
+    class Meta:
+        model = RequestField
+        fields = '__all__'
+        widgets = {
+            'choices': TextInput(attrs={'placeholder': 'Optional'}),
+            }
+
+    def __init__(self, *args, **kwargs):
+        super(RequestFieldModelForm, self).__init__(*args, **kwargs)
+        self.fields['choices'].required = False
+
+    def clean(self):
+        cleaned_data = super(RequestFieldModelForm, self).clean()
+        if cleaned_data['type'] == 'Email' and cleaned_data['choices']:
+            raise ValidationError(_("Email field can't have choices!"))
+
+
 class LeaseTypeForm(ModelForm):
     @property
     def helper(self):

circle/request/migrations/0005_requestfield.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-11-12 15:20
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('request', '0004_auto_20150629_1605'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='RequestField',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('fieldname', models.CharField(max_length=50, unique=True)),
+                ('type', models.CharField(choices=[(b'Char', b'CharField'), (b'Integer', b'IntegerField'), (b'Email', b'EmailField')], default=b'Char', max_length=20)),
+                ('choices', models.CharField(max_length=100, null=True)),
+                ('required', models.BooleanField(default=True)),
+            ],
+        ),
+    ]

circle/request/models.py

@@ -19,6 +19,7 @@ import logging
 
 from django.db.models import (
     Model, CharField, IntegerField, TextField, ForeignKey, ManyToManyField,
+    BooleanField,
 )
 from django.db.models.signals import post_save
 from django.conf import settings
@@ -44,6 +45,26 @@ from storage.models import Disk
 logger = logging.getLogger(__name__)
 
 
+TYPES = (
+    ('Char', 'CharField'),
+    ('Integer', 'IntegerField'),
+    ('Email', 'EmailField')
+    )
+
+
+class RequestField(Model):
+    fieldname = CharField(max_length=50, blank=False, unique=True)
+    type = CharField(choices=TYPES, default='Char', max_length=20)
+    choices = CharField(max_length=100, null=True)
+    required = BooleanField(default=True)
+
+    def __unicode__(self):
+        return self.fieldname
+
+    def get_absolute_url(self):
+        return reverse('fields_detail', kwargs={'pk': self.pk})
+
+
 class RequestAction(Model):
 
     def accept(self):