X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=dashboard%2Fsrc%2Fworkflow%2Fsnapshot_workflow.py;h=34ac3a558a475450e95bfeb4278c2f21a41d0272;hb=8864dae63b9512835862aabbe7f288fbe3c661e0;hp=4ddc397d47b0cc9da5d5e8baaa16d3beacdc9cd3;hpb=f2bbdbbf7e03be031723a9680aa9deaf80e4a99c;p=pharos-tools.git

diff --git a/dashboard/src/workflow/snapshot_workflow.py b/dashboard/src/workflow/snapshot_workflow.py
index 4ddc397..34ac3a5 100644
--- a/dashboard/src/workflow/snapshot_workflow.py
+++ b/dashboard/src/workflow/snapshot_workflow.py
@@ -8,13 +8,13 @@
 ##############################################################################
 
 
-import datetime
+from django.utils import timezone
 import json
 
 from booking.models import Booking
 from resource_inventory.models import Host, Image
 from workflow.models import WorkflowStep
-from workflow.forms import SnapshotMetaForm, SnapshotHostSelectForm
+from workflow.forms import BasicMetaForm, SnapshotHostSelectForm
 
 
 class Select_Host_Step(WorkflowStep):
@@ -27,7 +27,7 @@ class Select_Host_Step(WorkflowStep):
         context = super(Select_Host_Step, self).get_context()
         context['form'] = SnapshotHostSelectForm()
         booking_hosts = {}
-        now = datetime.datetime.now()
+        now = timezone.now()
         user = self.repo_get(self.repo.SESSION_USER)
         bookings = Booking.objects.filter(start__lt=now, end__gt=now, owner=user)
         for booking in bookings:
@@ -87,11 +87,18 @@ class Image_Meta_Step(WorkflowStep):
 
     def get_context(self):
         context = super(Image_Meta_Step, self).get_context()
-        context['form'] = SnapshotMetaForm()
+        name = self.repo_get(self.repo.SNAPSHOT_NAME, False)
+        desc = self.repo_get(self.repo.SNAPSHOT_DESC, False)
+        form = None
+        if name and desc:
+            form = BasicMetaForm(initial={"name": name, "description": desc})
+        else:
+            form = BasicMetaForm()
+        context['form'] = form
         return context
 
     def post_render(self, request):
-        form = SnapshotMetaForm(request.POST)
+        form = BasicMetaForm(request.POST)
         if form.is_valid():
             name = form.cleaned_data['name']
             self.repo_put(self.repo.SNAPSHOT_NAME, name)