x
/
compass-web
Code Issues Proposed changes

Merge "fixed: 1. server confidential 2. unchanged username and password on review page."

This commit is contained in:
Jenkins 2014-11-29 00:31:17 +00:00 committed by Gerrit Code Review
parent 64e8204035 d7c4935627
commit 7e2ebed331
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
v2/src/app/appDev.js
View File

@ -709,8 +709,8 @@ compassAppDev.run(function($httpBackend, settings, $http) {
var config = {
"os_config": {
"server_credentials": {
"username": "root",
"password": "huawei"
"username": "",
"password": ""
},
"partition": {
"/var": {

2
v2/src/app/services.js
View File

@ -465,7 +465,7 @@ define(['angular','uiBootstrap'], function(ng, uiBootstrap) {
};
wizard.getServerCredentials = function() {
return angular.copy(wizard.server_credentials);
return wizard.server_credentials;
}
wizard.setServiceCredentials = function(credentials) {
wizard.service_credentials = credentials;

12
v2/src/app/wizard/global.tpl.html
View File

@ -177,7 +177,14 @@
<div class="form-group">
<div>
<label class="col-sm-4 control-label no-padding-right">
Server Credentials
<h4> Server Credentials: </h4>
</label>
</div>
</div>
<div class="form-group">
<div>
<label class="col-sm-4 control-label no-padding-right">
User Name
<span class="text-danger">*</span>
</label>
<div class="col-sm-8">
@ -189,8 +196,10 @@
<div class="form-group">
<div>
<label class="col-sm-4 control-label no-padding-right">
Password
<span class="text-danger">*</span>
</label>
</label>
<div class="col-sm-8">
<input type="password" class="col-xs-10 col-sm-5" placeholder="Password" name="server-password" ng-model="server_credentials.password" required>
</div>
@ -200,6 +209,7 @@
<div class="form-group">
<div>
<label class="col-sm-4 control-label no-padding-right">
Confirm Password
<span class="text-danger">*</span>
</label>
<div class="col-sm-8">

2
v2/src/app/wizard/server_selection.tpl.html
View File

@ -109,4 +109,4 @@
</table>
</div>
</div>
</div>
</div>