From 0d90e4bb46e2d69fce28ab09236ca25352d401a0 Mon Sep 17 00:00:00 2001
From: catborise <catborise@yahoo.com>
Date: Fri, 21 Sep 2018 19:07:47 +0300
Subject: [PATCH] Make domain creation work with XML. Fix typo

---
 create/templates/create_instance.html | 8 +++++++-
 create/views.py                       | 4 ++--
 instances/views.py                    | 4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/create/templates/create_instance.html b/create/templates/create_instance.html
index ca93f2a..88b5fbe 100644
--- a/create/templates/create_instance.html
+++ b/create/templates/create_instance.html
@@ -279,7 +279,8 @@
                         <div class="well">
                             <form class="form-horizontal" method="post" role="form">{% csrf_token %}
                                 <div class="col-sm-12" id="xmlheight">
-                                    <textarea id="editor" name="from_xml"></textarea>
+                                     <input type="hidden" name="dom_xml"/>
+                                    <textarea id="editor"></textarea>
                                 </div>
                                 <button type="submit" class="btn btn-primary" name="create_xml" onclick="showPleaseWaitDialog()">
                                     {% trans "Create" %}
@@ -536,5 +537,10 @@
 <script>
     var editor = ace.edit("editor");
     editor.getSession().setMode("ace/mode/xml");
+
+    var input = $('input[name="dom_xml"]');
+    editor.getSession().on("change",function () {
+        input.val(editor.getSession().getValue());
+    })
 </script>
 {% endblock %}
diff --git a/create/views.py b/create/views.py
index 3da8d17..0c39a1d 100644
--- a/create/views.py
+++ b/create/views.py
@@ -74,10 +74,10 @@ def create_instance(request, compute_id):
                 delete_flavor.delete()
                 return HttpResponseRedirect(request.get_full_path())
             if 'create_xml' in request.POST:
-                xml = request.POST.get('from_xml', '')
+                xml = request.POST.get('dom_xml', '')
                 try:
                     name = util.get_xml_path(xml, '/domain/name')
-                except util.etree.ParserError:
+                except util.etree.Error as err:
                     name = None
                 if name in instances:
                     error_msg = _("A virtual machine with this name already exists")
diff --git a/instances/views.py b/instances/views.py
index a0dc8f5..4c6c4d6 100644
--- a/instances/views.py
+++ b/instances/views.py
@@ -451,7 +451,7 @@ def instance(request, compute_id, vname):
                     else:
                         error_messages.append(msg)
                 else:
-                    msg = _("Please shutdow down your instance and then try again")
+                    msg = _("Please shutdown down your instance and then try again")
                     error_messages.append(msg)
 
             if 'addpublickey' in request.POST:
@@ -473,7 +473,7 @@ def instance(request, compute_id, vname):
                     else:
                         error_messages.append(msg)
                 else:
-                    msg = _("Please shutdow down your instance and then try again")
+                    msg = _("Please shutdown down your instance and then try again")
                     error_messages.append(msg)
 
             if 'resize' in request.POST and (request.user.is_superuser or request.user.is_staff or userinstance.is_change):