From 2ba9c9f4fdd7297266499cee5235e89e2c42408b Mon Sep 17 00:00:00 2001
From: Elisha Oren <elisha.oren@hpe.com>
Date: Tue, 22 Nov 2016 17:58:39 +0200
Subject: [PATCH] fix js error while adding first ip-uni

Change-Id: I0dae91d4dffe6dff1ef50c8dd7093456fe9e141c
Signed-off-by: Elisha Oren <elisha.oren@hpe.com>
---
 .../src/main/resources/cpeui/tenant.controller.js      | 10 +++++++---
 .../src/main/resources/cpeui/tenant.tpl.html           |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/tenant.controller.js b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/tenant.controller.js
index 02f3b90f..937dbcdf 100644
--- a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/tenant.controller.js
+++ b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/tenant.controller.js
@@ -154,9 +154,13 @@ define([ 'app/cpeui/cpeui.module' ], function(cpeui) {
 
     $scope.ipUniDialog = new CpeuiDialogs.Dialog('AddIpUni', {}, function(obj) {
       CpeuiSvc.addIpUni(obj['uni-id'], obj['ip-uni-id'], obj['ip-address'], obj.vlan, obj.subnets, function() {
-          $scope.unis.filterByField('uni-id',obj['uni-id'])[0]['ip-unis']['ip-uni'].push(obj);
-          });
-    }, ipUniDialogController);
+        var uni = $scope.unis.filterByField('uni-id',obj['uni-id'])[0];
+        if (uni['ip-unis'] == undefined || uni['ip-unis']['ip-uni'] == undefined){
+          uni['ip-unis'] = {'ip-uni':[]};
+          }
+        uni['ip-unis']['ip-uni'].push(obj);
+        });
+      }, ipUniDialogController);
 
     $scope.openIpUniDialog = function(event,uni){
       if (uni['ip-unis'] && (uni['ip-unis']['ip-uni'] != undefined)){
diff --git a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/tenant.tpl.html b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/tenant.tpl.html
index 3ef02036..b09d83f6 100644
--- a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/tenant.tpl.html
+++ b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/tenant.tpl.html
@@ -121,7 +121,7 @@
 								</thead>
 								<tbody id="l2_table">
 									<tr ng-repeat="ipuni in ipvc.ipvc.unis.uni">
-										<td ng-init="serviceIpuni = getMefInterfaceIpvc(ipuni['uni-id'],ipuni['ip-uni-id'])">{{ ipuni.device }}</td>
+										<td ng-init="serviceIpuni = getMefInterfaceIpvc(ipuni['uni-id'],ipuni['ip-uni-id'])">{{ cesDisplayNames[ipuni.device] }}</td>
 										<td>{{ ipuni.prettyID }}</td>
 										<td>{{serviceIpuni['ip-address']}}</td>
 										<td>{{serviceIpuni.vlan}}</td>
@@ -147,7 +147,7 @@
 				</thead>
 				<tbody>
 					<tr ng-repeat="uni in unis | orderBy: '[\'uni-id\']'">					
-						<td class="minimal-width">{{ uni.device }}</td>
+						<td class="minimal-width">{{ cesDisplayNames[uni.device] }}</td>
 						<td class="minimal-width">{{ uni.prettyID }}</td>
 						<td>
 						<button class="btn btn-info add-row" ng-click="expandFlags.tuni[uni['uni-id']] = false" ng-if="expandFlags.tuni[uni['uni-id']]">
-- 
2.36.6