Merge branch 'master' of https://gitlab.rezometz.org/rezo/re2o

machines/forms.py

@@ -0,0 +1,36 @@
+from django.forms import ModelForm, Form, ValidationError
+from .models import Machine, Interface 
+
+class EditMachineForm(ModelForm):
+    class Meta:
+        model = Machine
+        fields = '__all__'
+
+    def __init__(self, *args, **kwargs):
+        super(EditMachineForm, self).__init__(*args, **kwargs)
+        self.fields['name'].label = 'Nom de la machine'
+        self.fields['type'].label = 'Type de machine'
+        self.fields['type'].empty_label = "Séléctionner un type de machine"
+
+class NewMachineForm(EditMachineForm):
+    class Meta(EditMachineForm.Meta):
+        fields = ['type','name']
+
+class EditInterfaceForm(ModelForm):
+    class Meta:
+        model = Interface
+        fields = '__all__'
+
+    def __init__(self, *args, **kwargs):
+        super(EditInterfaceForm, self).__init__(*args, **kwargs)
+        self.fields['dns'].label = 'Nom dns de la machine'
+        self.fields['mac_address'].label = 'Adresse mac'
+
+class AddInterfaceForm(EditInterfaceForm):
+    class Meta(EditInterfaceForm.Meta):
+        fields = ['ipv4','mac_address','dns','details']
+
+class NewInterfaceForm(EditInterfaceForm):
+    class Meta(EditInterfaceForm.Meta):
+        fields = ['mac_address','dns','details']
+

machines/models.py

@@ -1,5 +1,5 @@
 from django.db import models
-from django.forms import ModelForm, Form, ValidationError
+from django.forms import ValidationError
 from macaddress.fields import MACAddressField
 
 from django.conf import settings
@@ -64,35 +64,3 @@ class IpList(models.Model):
     def __str__(self):
         return self.ipv4
 
-class EditMachineForm(ModelForm):
-    class Meta:
-        model = Machine
-        fields = '__all__'
-
-    def __init__(self, *args, **kwargs):
-        super(EditMachineForm, self).__init__(*args, **kwargs)
-        self.fields['name'].label = 'Nom de la machine'
-        self.fields['type'].label = 'Type de machine'
-        self.fields['type'].empty_label = "Séléctionner un type de machine"
-
-class NewMachineForm(EditMachineForm):
-    class Meta(EditMachineForm.Meta):
-        fields = ['type','name']
-
-class EditInterfaceForm(ModelForm):
-    class Meta:
-        model = Interface
-        fields = '__all__'
-
-    def __init__(self, *args, **kwargs):
-        super(EditInterfaceForm, self).__init__(*args, **kwargs)
-        self.fields['dns'].label = 'Nom dns de la machine'
-        self.fields['mac_address'].label = 'Adresse mac'
-
-class AddInterfaceForm(EditInterfaceForm):
-    class Meta(EditInterfaceForm.Meta):
-        fields = ['ipv4','mac_address','dns','details']
-
-class NewInterfaceForm(EditInterfaceForm):
-    class Meta(EditInterfaceForm.Meta):
-        fields = ['mac_address','dns','details']

machines/views.py

@@ -7,7 +7,7 @@ from django.core.context_processors import csrf
 from django.template import Context, RequestContext, loader
 from django.contrib import messages
 
-from .models import NewMachineForm, EditMachineForm, EditInterfaceForm, AddInterfaceForm, NewInterfaceForm
+from .forms import NewMachineForm, EditMachineForm, EditInterfaceForm, AddInterfaceForm, NewInterfaceForm
 from .models import Machine, Interface, IpList
 from users.models import User