From e9643c4783cf156d3d2b4aaf75b0f90aaf333d4a Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Thu, 15 Jun 2017 07:16:05 +0530
Subject: [PATCH 1/2] Deleted django.mo of hosting

---
 hosting/locale/de/LC_MESSAGES/django.mo | Bin 5794 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 hosting/locale/de/LC_MESSAGES/django.mo

diff --git a/hosting/locale/de/LC_MESSAGES/django.mo b/hosting/locale/de/LC_MESSAGES/django.mo
deleted file mode 100644
index 1a9bb493dec8c012747c53e56f2afdd0f4aa65c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5794
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
NLz|^AV#O%e{1<W%*XIBL


From 5b4e9b733d4d7a4be43aa840e9ec0b8f1c29c3b2 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Thu, 15 Jun 2017 07:30:47 +0530
Subject: [PATCH 2/2] Tentative fix for error 500 on order details page

---
 hosting/templates/hosting/order_detail.html | 14 ++++++++++++++
 hosting/templates/hosting/orders.html       |  3 +--
 hosting/views.py                            | 11 +++++++++--
 opennebula_api/models.py                    |  5 +++--
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index 7705a006..5745a93c 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -4,7 +4,20 @@
 {% block content %} 
 
 <div class="order-detail-container">
+   {% if messages %}
     <div class="row">
+        <div class="col-xs-12 col-md-8 col-md-offset-2">
+            <br/>
+                <div class="alert alert-warning">
+                    {% for message in messages %}
+                    <span>{{ message }}</span>
+                    {% endfor %}
+                </div>
+        </div>
+    </div>
+    {% endif %}
+    {% if not error %}
+    <div class="row">  
         <div class="col-xs-12 col-md-8 col-md-offset-2">
     		<div class="invoice-title">
     			<h2>{% trans "Invoice"%}</h2><h3 class="pull-right">{% trans "Order #"%} {{order.id}}</h3>
@@ -66,5 +79,6 @@
             {% endif %}
         </div>
     </div>
+    {% endif %}
 </div>
 {%endblock%}
diff --git a/hosting/templates/hosting/orders.html b/hosting/templates/hosting/orders.html
index 42b77e88..b52e7fc0 100644
--- a/hosting/templates/hosting/orders.html
+++ b/hosting/templates/hosting/orders.html
@@ -33,9 +33,8 @@
                                 {% endif %}
                                 </td>
                                 <td>
-                                    <button type="button" class="btn btn-default"><a
+                                    <a class="btn btn-default"
                                             href="{% url 'hosting:orders' order.id %}">{% trans "View Detail"%}</a>
-                                    </button>
                                     <button type="button" class="btn btn-default" data-toggle="modal"
                                             data-target="#Modal{{ order.id }}"><a
                                             href="#">{% trans "Cancel Order"%}</a>
diff --git a/hosting/views.py b/hosting/views.py
index fc7796e1..510d8439 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -35,7 +35,7 @@ from opennebula_api.serializers import VirtualMachineSerializer,\
 
 
 from oca.exceptions import OpenNebulaException
-from oca.pool import WrongNameError
+from oca.pool import WrongNameError, WrongIdError
 
 CONNECTION_ERROR = "Your VMs cannot be displayed at the moment due to a backend \
                     connection error. please try again in a few minutes."
@@ -583,8 +583,15 @@ class OrdersHostingDetailView(PermissionRequiredMixin, LoginRequiredMixin, Detai
         try:
             vm = manager.get_vm(obj.vm_id)
             context['vm'] = VirtualMachineSerializer(vm).data
+        except WrongIdError:
+            messages.error(self.request,
+                           'The VM you are looking for is unavailable at the moment. \
+                            Please contact Data Center Light support.'
+                           )
+            self.kwargs['error'] = 'WrongIdError'
+            context['error'] = 'WrongIdError'
         except ConnectionRefusedError:
-            messages.error(request,
+            messages.error(self.request,
                            'In order to create a VM, you need to create/upload your SSH KEY first.'
                            )
         return context
diff --git a/opennebula_api/models.py b/opennebula_api/models.py
index 7330a7fe..397c0f0c 100644
--- a/opennebula_api/models.py
+++ b/opennebula_api/models.py
@@ -2,7 +2,7 @@ import oca
 import socket
 import logging
 
-from oca.pool import WrongNameError
+from oca.pool import WrongNameError, WrongIdError
 from oca.exceptions import OpenNebulaException
 
 from django.conf import settings
@@ -204,6 +204,8 @@ class OpenNebulaManager():
         try:
             vm_pool = self._get_vm_pool()
             return vm_pool.get_by_id(vm_id)
+        except WrongIdError:
+            raise WrongIdError
         except:
             raise ConnectionRefusedError
 
@@ -449,7 +451,6 @@ class OpenNebulaManager():
         """
         # TODO: Check if we can remove this first try because we basically just
         # raise the possible Errors 
-
         try:
             open_user = self._get_user(user)
             try: