one: do not recontext if not needed

one/views.py

@@ -193,7 +193,8 @@ def vm_saveas(request, vmid):
 @require_POST
 @require_POST
 @login_required
 @login_required
 def vm_new(request, template=None, share=None):
 def vm_new(request, template=None, share=None):
-    base = None 
+    base = None
+    extra = None
     if template:
     if template:
         base = get_object_or_404(Template, pk=template)
         base = get_object_or_404(Template, pk=template)
     else:
     else:
@@ -209,10 +210,11 @@ def vm_new(request, template=None, share=None):
         t.system = base.system
         t.system = base.system
         t.save()
         t.save()
         base = t
         base = t
+        extra = "<RECONTEXT>YES</RECONTEXT>"
     try:
     try:
         #Gány quota
         #Gány quota
-        if share == None or (share != None and share.get_running() < share.instance_limit):
-            i = Instance.submit(base, request.user, extra="<RECONTEXT>YES</RECONTEXT>", share=share)
+        if share == None or (share != None and share.get_running() < share.instance_limit) or extra:
+            i = Instance.submit(base, request.user, extra=extra, share=share)
         return redirect(i)
         return redirect(i)
     except Exception as e:
     except Exception as e:
         logger.error('Failed to create virtual machine.' + unicode(e))
         logger.error('Failed to create virtual machine.' + unicode(e))