x/compass-web
Code Issues Proposed changes

Merge "fix add interface bug"

Browse Source
This commit is contained in:
Jenkins 2016-01-12 02:41:17 +00:00 committed by Gerrit Code Review
commit 4d7e9e23c9
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
v2.5/data/sample_machine_uploadfile.txt
View File

@ -1,5 +1,5 @@
00:01:02:03:04:11,8,127.0.0.1 00:01:02:03:04:05,8,127.0.0.1
00:01:02:03:04:12,8,127.0.0.1 00:01:02:03:04:06,8,127.0.0.1
00:01:02:03:04:13,8,127.0.0.1 00:01:02:03:04:07,8,127.0.0.1
00:01:02:03:04:14,8,127.0.0.1 00:01:02:03:04:08,8,127.0.0.1
00:01:02:03:04:15,8,127.0.0.1 00:01:02:03:04:09,8,127.0.0.1

2
v2.5/src/app/controllers/wizardController.coffee
View File

@ -545,8 +545,6 @@ define(['./baseController'], ()->
wizardService.displayDataInTable($scope, $scope.servers) wizardService.displayDataInTable($scope, $scope.servers)
$scope.reload = ->
wizardService.displayDataInTable($scope, $scope.servers)
] ]
.animation '.fade-animation', [-> .animation '.fade-animation', [->
return{ return{

2
v2.5/src/app/services/wizardService.coffee
View File

@ -621,6 +621,8 @@ define(['./baseService'], ()->
) )
addInterface: ($scope, newInterface) -> addInterface: ($scope, newInterface) ->
isExist = false isExist = false
if !$scope.interfaces
$scope.interfaces = {}
if newInterface if newInterface
for key, value of $scope.interfaces for key, value of $scope.interfaces
if key == newInterface.name if key == newInterface.name

5
v2.5/target/src/app/controllers/wizardController.js
View File

@ -631,10 +631,7 @@
$scope.commit = function(sendRequest) { $scope.commit = function(sendRequest) {
return wizardService.reviewCommit($scope, sendRequest); return wizardService.reviewCommit($scope, sendRequest);
}; };
wizardService.displayDataInTable($scope, $scope.servers); return wizardService.displayDataInTable($scope, $scope.servers);
return $scope.reload = function() {
return wizardService.displayDataInTable($scope, $scope.servers);
};
} }
]).animation('.fade-animation', [ ]).animation('.fade-animation', [
function() { function() {

3
v2.5/target/src/app/services/wizardService.js
View File

@ -945,6 +945,9 @@
WizardService.prototype.addInterface = function($scope, newInterface) { WizardService.prototype.addInterface = function($scope, newInterface) {
var isExist, key, value, _ref; var isExist, key, value, _ref;
isExist = false; isExist = false;
if (!$scope.interfaces) {
$scope.interfaces = {};
}
if (newInterface) { if (newInterface) {
_ref = $scope.interfaces; _ref = $scope.interfaces;
for (key in _ref) { for (key in _ref) {