From 5d4cce4eac874bdc391b3643b10ca1d4c3570c2f Mon Sep 17 00:00:00 2001
From: zhuyj17 <firmlyzhu@163.com>
Date: Mon, 19 Nov 2018 00:23:17 +0800
Subject: [PATCH 1/2] Fix some bugs on history.html

---
 web/templates/monitor/history.html | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/web/templates/monitor/history.html b/web/templates/monitor/history.html
index 8b697a9..72a85e0 100644
--- a/web/templates/monitor/history.html
+++ b/web/templates/monitor/history.html
@@ -32,8 +32,8 @@
        </div>
      </div>
                  <div class="box-body">
-                   <div class="table table-responsive">
-                     <table class="table table-striped table-bordered table-hover table-image" >
+                   <div class="table">
+                     <table width="100%" cellspacing="0" style="margin:0 auto;" class="table table-striped table-bordered table-hover table-history" >
                         <thead>
                     	<tr>
                         <th>NO</th>
@@ -65,17 +65,14 @@
 {% endblock %}
 
 {% block script_src %}
-<script src="//cdn.bootcss.com/jquery/2.2.1/jquery.min.js"></script>
-<script src="http://cdn.bootcss.com/datatables/1.10.11/js/jquery.dataTables.js"></script>
-<script src="http://cdn.bootcss.com/datatables/1.10.11/js/dataTables.bootstrap.js"></script>
-<script src="http://cdn.bootcss.com/datatables-tabletools/2.1.5/js/TableTools.min.js"></script>
+<script src="//cdn.bootcss.com/datatables/1.10.11/js/jquery.dataTables.min.js"></script>
+<script src="//cdn.bootcss.com/datatables/1.10.11/js/dataTables.bootstrap.min.js"></script>
 
 <script>
          $(document).ready(function() {
-            $(".table-image").DataTable();
+            $(".table-history").DataTable({"scrollX":true});
          });
 
  </script>
 
 {% endblock %}
-

From 363a076ff5b345e888f0da6c4ca3530018e0ca33 Mon Sep 17 00:00:00 2001
From: zhuyj17 <firmlyzhu@163.com>
Date: Wed, 21 Nov 2018 23:52:31 +0800
Subject: [PATCH 2/2] Fix 2 bugs in imagemgr

---
 src/utils/imagemgr.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils/imagemgr.py b/src/utils/imagemgr.py
index 889023a..7f02e69 100755
--- a/src/utils/imagemgr.py
+++ b/src/utils/imagemgr.py
@@ -387,10 +387,10 @@ class ImageMgr():
         if imagename == "base" and imagetype == "base":
             return 0
         if imagetype == "private":
-            imgpath = self.imgpath + "private/" + user + "/"
+            imgpath = self.imgpath + "private/" + imageowner + "/"
         else:
             imgpath = self.imgpath + "public/" + imageowner + "/"
-        return os.stat(os.path.join(imgpath, imagename)).st_size // (1024*1024)
+        return os.stat(os.path.join(imgpath, imagename+".tz")).st_size // (1024*1024)
 
 
     def format_size(self, size_in_byte):