x/compass-web
Code Issues Proposed changes

Merge "Fix retrieving interfaces on Network page"

Browse Source
This commit is contained in:
Jenkins 2014-09-11 18:45:26 +00:00 committed by Gerrit Code Review
commit 363ea9b4cf
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
v2/src/app/wizard/network.tpl.html
View File

@ -92,8 +92,8 @@
<h4>Autofill Hostname</h4>
<select id="hostname-rule" class="input-large">
<option value="">Please select a pattern</option>
<option value="host" selected="selected">Host</option>
<option value="" selected="selected">Please select a pattern</option>
<option value="host">Host</option>
<option value="switch_ip">Switch IP</option>
</select>

10
v2/src/app/wizard/wizard.js
View File

@ -549,6 +549,16 @@ angular.module('compass.wizard', [
dataService.getClusterHosts(cluster.id).success(function(data) {
$scope.servers = data;
// Assume all hosts in the same cluster have same interface settings
if($scope.servers[0].networks) {
if(Object.keys($scope.servers[0].networks).length != 0) {
$scope.interfaces = $scope.servers[0].networks;
wizardFactory.setInterfaces($scope.interfaces);
}
}
$scope.tableParams = new ngTableParams({
page: 1, // show first page
count: $scope.servers.length + 1 // count per page