From fb2148833b65870712bf1ac6c6b4409e5b1148c0 Mon Sep 17 00:00:00 2001
From: zhuyj17 <firmlyzhu@163.com>
Date: Mon, 25 Apr 2016 01:00:06 +0800
Subject: [PATCH] Add truename on Node list page.

---
 src/httprest.py                        | 8 +++++++-
 web/templates/monitor/hostsConAll.html | 4 +++-
 web/web.py                             | 4 ++--
 web/webViews/monitor.py                | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/httprest.py b/src/httprest.py
index fdc6675..0053be7 100755
--- a/src/httprest.py
+++ b/src/httprest.py
@@ -348,7 +348,13 @@ class DockletHttpHandler(http.server.BaseHTTPRequestHandler):
                     res['basic_info'] = fetcher.get_basic_info(cmds[2])
                 elif cmds[3] == 'owner':
                     names = cmds[2].split('-')
-                    res['owner'] = names[0]
+                    result = G_usermgr.query(username = names[0], cur_user = cur_user)
+                    if result['success'] == 'false':
+                        res['username'] = ""
+                        res['truename'] = ""
+                    else:
+                        res['username'] = result['data']['username']
+                        res['truename'] = result['data']['truename']
                 else:
                     res = "Unspported Method!"
                 self.response(200, {'success':'true', 'monitor':res})
diff --git a/web/templates/monitor/hostsConAll.html b/web/templates/monitor/hostsConAll.html
index 36d917f..c2302f5 100644
--- a/web/templates/monitor/hostsConAll.html
+++ b/web/templates/monitor/hostsConAll.html
@@ -38,6 +38,7 @@
 				                 <th>NO</th>
 				                 <th>Name</th>
                                  <th>Owner</th>
+                                 <th>Owner's Truename</th>
                                  <th>State</th>
                                  <th>PID</th>
                                  <th>IP Address</th>
@@ -51,7 +52,8 @@
                              <tr>
                                  <td>{{ loop.index }}</td>
                                  <td>{{ container['Name'] }}</td>
-                                 <td id='{{ loop.index }}_owner'>{{ container['owner'] }}</td>
+                                 <td>{{ container['owner']['username'] }}</td>
+                                 <td>{{ container['owner']['truename'] }}</td>
                                  {% if container['State'] == 'STOPPED' %}
                                  <td><div id='{{ loop.index }}_state' class="label label-danger">Stopped</div></td>
                                  <td id='{{ loop.index }}_pid'>--</td>
diff --git a/web/web.py b/web/web.py
index 76f31ee..5d041b6 100755
--- a/web/web.py
+++ b/web/web.py
@@ -275,11 +275,11 @@ def monitor_request(comid,infotype):
     result = dockletRequest.post(request.path, data)
     return json.dumps(result)
 
-@app.route("/monitor/User/", methods=['GET'])
+'''@app.route("/monitor/User/", methods=['GET'])
 @administration_required
 def monitorUserAll():
     return monitorUserAllView.as_view()
-
+'''
 
 
 
diff --git a/web/webViews/monitor.py b/web/webViews/monitor.py
index 9e77ded..6a48939 100755
--- a/web/webViews/monitor.py
+++ b/web/webViews/monitor.py
@@ -78,7 +78,7 @@ class hostsConAllView(normalView):
             result = dockletRequest.post('/monitor/vnodes/%s/basic_info'%(container), data)
             basic_info = result.get('monitor').get('basic_info')
             result = dockletRequest.post('/monitor/vnodes/%s/owner'%(container), data)
-            owner = result.get('monitor').get('owner')
+            owner = result.get('monitor')
             basic_info['owner'] = owner
             containerslist.append(basic_info)
         return self.render(self.template_path, containerslist = containerslist, com_ip = self.com_ip, user = session['username'])