Browse Source

select2 ip / service

Élie Bouttier 8 years ago
parent
commit
555010668c
2 changed files with 8 additions and 10 deletions
  1. 6 8
      services/forms.py
  2. 2 2
      services/views.py

+ 6 - 8
services/forms.py

@@ -16,13 +16,11 @@ class ServiceForm(ModelForm):
         }
 
 
-class ResourceAllocationForm(ReadOnlyModelForm):
-    def __init__(self, *args, **kwargs):
-        initial = kwargs.get('initial', dict())
-        initial.update({'start': timezone.now()})
-        super().__init__(*args, **kwargs)
-
+class ResourceAllocationForm(ModelForm):
     class Meta:
         model = ResourceAllocation
-        fields = ('service', 'resource', 'start',)
-        readonly_fields = ('start',)
+        fields = ('service', 'resource',)
+        widgets = {
+            'service': Select2Widget(),
+            'resource': Select2Widget(),
+        }

+ 2 - 2
services/views.py

@@ -40,7 +40,7 @@ class ServiceUpdate(ServiceMixin, UpdateView):
 class ServiceAllocate(PermissionRequiredMixin, CreateView):
     model = ResourceAllocation
     permission_required = 'services.change_resourceallocation'
-    fields = ('service', 'resource',)
+    form_class = ResourceAllocationForm
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -97,7 +97,7 @@ class IPResourceDetail(IPResourceMixin, DetailView):
 class IPResourceAllocate(PermissionRequiredMixin, CreateView):
     model = ResourceAllocation
     permission_required = 'services.change_resourceallocation'
-    fields = ('service', 'resource',)
+    form_class = ResourceAllocationForm
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)