Code Review
/
honeycomb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Inventory rework
[honeycomb.git]
/
vbd
/
gui
/
module
/
src
/
main
/
resources
/
vpp
/
controllers
/
bdm.controller.js
diff --git
a/vbd/gui/module/src/main/resources/vpp/controllers/bdm.controller.js
b/vbd/gui/module/src/main/resources/vpp/controllers/bdm.controller.js
index
b49fe8a
..
d8fe8ea
100644
(file)
--- a/
vbd/gui/module/src/main/resources/vpp/controllers/bdm.controller.js
+++ b/
vbd/gui/module/src/main/resources/vpp/controllers/bdm.controller.js
@@
-47,8
+47,7
@@
define(['app/vpp/vpp.module'], function(vpp) {
});
};
});
};
- /*var vm = this;
- vm.dataService = dataService;
+ $scope.dataService = dataService;
dataService.nextApp.container(document.getElementById('bridge-domains-next-app'));
dataService.bridgeDomainsTopo.attach(dataService.nextApp);
dataService.nextApp.container(document.getElementById('bridge-domains-next-app'));
dataService.bridgeDomainsTopo.attach(dataService.nextApp);
@@
-59,19
+58,19
@@
define(['app/vpp/vpp.module'], function(vpp) {
}
});
}
});
-
vm
.bridgedomains = dataService.bridgedomains;
-
vm
.selectedBd = dataService.selectedBd;
+
$scope
.bridgedomains = dataService.bridgedomains;
+
$scope
.selectedBd = dataService.selectedBd;
dataService.bridgeDomainsTopo.on('clickNode',function(topo,node) {
console.log(node);
});
dataService.bridgeDomainsTopo.on('clickNode',function(topo,node) {
console.log(node);
});
-
vm
.bdChanged = function() {
+
$scope
.bdChanged = function() {
dataService.injectBridgeDomainsTopoElements();
dataService.buildTableContent();
};
dataService.injectBridgeDomainsTopoElements();
dataService.buildTableContent();
};
-
vm
.addBd = function() {
+
$scope
.addBd = function() {
//show dialog
$mdDialog.show({
controller: function() {
//show dialog
$mdDialog.show({
controller: function() {
@@
-111,20
+110,20
@@
define(['app/vpp/vpp.module'], function(vpp) {
-
vm
.deploy = function() {
+
$scope
.deploy = function() {
};
};
-
vm
.removeBd = function() {
- if(
vm
.selectedBd.name) {
+
$scope
.removeBd = function() {
+ if(
$scope
.selectedBd.name) {
var successCallback = function(success) {
if (success) {
var successCallback = function(success) {
if (success) {
- console.log(
vm
.bridgedomains);
- _.remove(
vm
.bridgedomains, {
- name:
vm
.selectedBd.name
+ console.log(
$scope
.bridgedomains);
+ _.remove(
$scope
.bridgedomains, {
+ name:
$scope
.selectedBd.name
});
toastService.showToast('Bridge Domain Removed!');
});
toastService.showToast('Bridge Domain Removed!');
-
vm
.selectedBd.name = '';
+
$scope
.selectedBd.name = '';
dataService.clearInjectedInterfacesInBridgeDomainTopo();
dataService.injectBdIntoBridgeDomainsTopo();
dataService.tableContent.length = 0;
dataService.clearInjectedInterfacesInBridgeDomainTopo();
dataService.injectBdIntoBridgeDomainsTopo();
dataService.tableContent.length = 0;
@@
-137,6
+136,6
@@
define(['app/vpp/vpp.module'], function(vpp) {
//... removeBdFromOdl(vm.selectedBd.name, successCallback);
}
};
//... removeBdFromOdl(vm.selectedBd.name, successCallback);
}
};
- */
+
}]);
});
\ No newline at end of file
}]);
});
\ No newline at end of file