From 993330a8817ffbd94a4f4bbd38d20e26b2e77350 Mon Sep 17 00:00:00 2001
From: c00149107 <chenchuanyu@huawei.com>
Date: Mon, 24 Apr 2017 17:47:59 +0800
Subject: Fix resmgr client showing errors

Fix resmgr client showing errors

Change-Id: I493d7089c262ee0bf8078259fe2e287d2966731f
Issue-ID:CLIENT-200
Signed-off-by: c00149107 <chenchuanyu@huawei.com>
---
 extsys/src/main/webapp/extsys/sdncontroller/js/app.js      |  4 ++--
 .../webapp/extsys/sdncontroller/templates/controller.html  | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'extsys')

diff --git a/extsys/src/main/webapp/extsys/sdncontroller/js/app.js b/extsys/src/main/webapp/extsys/sdncontroller/js/app.js
index 25fb256b..9a47d6c6 100644
--- a/extsys/src/main/webapp/extsys/sdncontroller/js/app.js
+++ b/extsys/src/main/webapp/extsys/sdncontroller/js/app.js
@@ -122,7 +122,7 @@ var app = angular.module("ControllerApp", ["ui.router", "ngTable"])
 
             $('#myModal #protocol').append($compile(Mustache.to_html(dropDown, dropdowndata_protocol))($scope));*/
 
-            var dropdownResponse=[{"id":"netconf","name":"netconf"},{"id":"snmp","name":"snmp"}];
+            var dropdownResponse=[{"id":"netconf","name":"netconf"},{"id":"snmp","name":"snmp"},{"id":"https","name":"https"},{"id":"http","name":"http"}];
             var dropdownInfo = translateToDropdownInfo(dropdownResponse);
             $('#myModal #protocolDD').html(dropdownInfo);
 
@@ -156,7 +156,7 @@ var app = angular.module("ControllerApp", ["ui.router", "ngTable"])
 
             //var data = [{id: 1, name: "Moroni", age: 50}, {id: 2, name: "ABC", age: 30}, {id: 3, name: "Morhoni", age: 10}, {id: 4, name: "DABC", age: 31}, {id: 5, name: "Noor", age: 30}, {id: 6, name: "ABCD", age: 40}, {id: 7, name: "DABC", age: 31}, {id: 8, name: "Noor", age: 30}, {id: 9, name: "ABCD", age: 40}, {id: 10, name: "DABC", age: 31}, {id: 11, name: "Noor", age: 30}, {id: 12, name: "ABCD", age: 40}];
             $scope.controllerTableParams = new NgTableParams({count: 5, sorting: {name: 'asc'}    //{page: 1,count: 10,filter: {name: 'M'},sorting: {name: 'desc'}
-            }, { counts:[5, 10, 20, 50], dataset: $scope.data.controllerData});
+            }, { counts:[5, 10, 20, 50], dataset: $scope.data});
 
             /*$scope.$watch('checkboxes.checked', function(value) {
              angular.forEach($scope.data.controllerData, function(item) {
diff --git a/extsys/src/main/webapp/extsys/sdncontroller/templates/controller.html b/extsys/src/main/webapp/extsys/sdncontroller/templates/controller.html
index 1aab2bdf..2d336101 100644
--- a/extsys/src/main/webapp/extsys/sdncontroller/templates/controller.html
+++ b/extsys/src/main/webapp/extsys/sdncontroller/templates/controller.html
@@ -30,32 +30,32 @@
             <input type="checkbox" ng-model="checkboxes.items[controllerData.id]" />
         </td>-->
         <td title="'Name'" filter="{ Name: 'text'}" sortable="'Name'">
-            {{controllerData.Name}}
+            {{controllerData.name}}
         </td>
         <td title="'Protocol'" filter="{ Protocol: 'text'}" sortable="'Protocol'">
-            {{controllerData.Protocol}}
+            {{controllerData.protocol}}
         </td>
         <td title="'Product Name'" filter="{ productName: 'text'}" sortable="'productName'">
             {{controllerData.productName}}
         </td>
         </td>
         <td title="'Type'" filter="{ Type: 'text'}" sortable="'Type'">
-            {{controllerData.Type}}
+            {{controllerData.type}}
         </td>
         <td title="'Vendor'" filter="{ Vendor: 'text'}" sortable="'Vendor'">
-            {{controllerData.Vendor}}
+            {{controllerData.vendor}}
         </td>
         <td title="'Version'" filter="{ Version: 'number'}" sortable="'Version'">
-            {{controllerData.Version}}
+            {{controllerData.version}}
         </td>
         <td title="'Description'" filter="{ Description: 'text'}" sortable="'Description'">
-            {{controllerData.Description}}
+            {{controllerData.description}}
         </td>
         <td title="'Create Time'" filter="{ createTime: 'number'}" sortable="'createTime'">
             {{controllerData.createTime}}
         </td>
         <td title="'Operation'" filter="{ Operation: 'text'}" sortable="'Operation'">
-            {{controllerData.Operation}}
+            {{controllerData.operation}}
         </td>
         <td title="'Action'">
            <!-- <span class="pull-right glyphicon glyphicon-edit" ng-click="editData(controllerData.name)" style="cursor: pointer;margin: 0 5px"></span>
-- 
cgit 1.2.3-korg