refactoring to support delete\update of servics.

[unimgr.git] / dlux / cpeui / cpeui-module / src / main / resources / cpeui / tenant.tpl.html

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 f5f7f997f116f75c9c4bef95c4b82b5185d7a69e..73626638f346c3800f1c9162e8272a5119577d61 100644 (file)
--- a/dlux/cpeui/cpeui-module/src/main/resources/cpeui/tenant.tpl.html
+++ b/dlux/cpeui/cpeui-module/src/main/resources/cpeui/tenant.tpl.html
@@ -175,7 +175,7 @@
                                                                                <td>{{ ipuni.prettyID }}</td>
                                                                                <td>{{serviceIpuni['ip-address']}}</td>
                                                                                <td>{{serviceIpuni.vlan}}</td>
-                                                                               <td class="delete-tr"><button class="btn btn-md btn-danger" ng-click="deleteIpvcUni(ipvc['svc-id'], ipuni['uni-id'])"> <i class="icon-trash"></i> </button></td>
+                                                                               <td class="delete-tr"><button class="btn btn-md btn-danger" ng-click="deleteIpvcUni(ipvc['svc-id'], ipuni['uni-id'], ipuni['ip-uni-id'])"> <i class="icon-trash"></i> </button></td>
                                                                        </tr>                                                                                                                                           
                                                                </tbody>
                                                        </table>
@@ -205,7 +205,7 @@
                                                                                <td>{{ ipuni.prettyID }}</td>
                                                                                <td>{{serviceIpuni['ip-address']}}</td>
                                                                                <td>{{serviceIpuni.vlan}}</td>
-                                                                               <td class="delete-tr"><button class="btn btn-md btn-danger" ng-click="deleteIpvcUni(ipvc['svc-id'], ipuni['uni-id'])"> <i class="icon-trash"></i> </button></td>
+                                                                               <td class="delete-tr"><button class="btn btn-md btn-danger" ng-click="deleteIpvcUni(ipvc['svc-id'], ipuni['uni-id'], ipuni['ip-uni-id'])"> <i class="icon-trash"></i> </button></td>
                                                                        </tr>                                                                   
                                                                </tbody>
                                                        </table>
@@ -255,14 +255,14 @@
                                                                                <td class="minimal-width">{{ ipuni.vlan }}</td>
                                                                                <td class="minimal-width">{{ ipuni['ip-address'] }}</td>
                                                                                <td>
-                                                                               <button class="btn add-row" ng-click="expandFlags.ipuni[ipuni['ip-uni-id']] = true" ng-if="!expandFlags.ipuni[ipuni['ip-uni-id']]">
+                                                                               <button class="btn add-row" ng-click="expandFlags.ipuni[uni['uni-id']+':'+ipuni['ip-uni-id']] = true" ng-if="!expandFlags.ipuni[uni['uni-id']+':'+ipuni['ip-uni-id']]">
                                                                                        <i class="icon-plus"></i> Show Subnets
                                                                                </button>
-                                                                                       <table class="footable table table-striped inner-table" ng-if="expandFlags.ipuni[ipuni['ip-uni-id']]">
+                                                                                       <table class="footable table table-striped inner-table" ng-if="expandFlags.ipuni[uni['uni-id']+':'+ipuni['ip-uni-id']]">
                                                                                                <thead>
                                                                                                        <tr>
                                                                                                                <th class="minimal-width">
-                                                                                                                       <button class="btn add-row" ng-click="expandFlags.ipuni[ipuni['ip-uni-id']] = false">
+                                                                                                                       <button class="btn add-row" ng-click="expandFlags.ipuni[uni['uni-id']+':'+ipuni['ip-uni-id']] = false">
                                                                                                                                <i class="icon-minus"></i>
                                                                                                                        </button>
                                                                                                                </th>
@@ -272,7 +272,7 @@
                                                                                                        </tr>
                                                                                                </thead>
                                                                                                <tbody>
-                                                                                                       <tr ng-repeat="subnet in ipuni['subnets']['subnet'] | orderBy: subnet">
+                                                                                                       <tr ng-repeat="subnet in subnets[uni['uni-id']][ipuni['ip-uni-id']] | orderBy: subnet" ng-if="subnets[uni['uni-id']]">
                                                                                                                <td colspan="2">{{ subnet.subnet }}</td>
                                                                                                                <td>{{ subnet.gateway }}</td>
                                                                                                                <td class="delete-tr"><button class="btn btn-md btn-danger" ng-click="deleteIpUniSubnet(uni['uni-id'],ipuni['ip-uni-id'],subnet.subnet)"> <i class="icon-trash"></i> </button></td>