Merge pull request #87 from jumpserver/manual

Manual

src/app/app.service.ts

@@ -107,10 +107,10 @@ export class HttpService {
       .set('system_user_id', system_user_id)
       .set('token', DataStore.guacamole_token);
     if (system_user_username) {
-      params.set('username', system_user_username);
+      params = params.set('username', system_user_username);
     }
     if (system_user_password) {
-      params.set('password', system_user_password);
+      params = params.set('password', system_user_password);
     }
     const solution = localStorage.getItem('rdpSolution') || 'Auto';
     if (solution !== 'Auto') {

src/app/elements/asset-tree/asset-tree.component.ts

@@ -279,6 +279,7 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
   }
 
   manualSetUserAuthLogin(host, user) {
+    user = Object.assign({}, user);
     const dialogRef = this._dialog.open(ManualPasswordDialogComponent, {
       height: '250px',
       width: '400px',

src/app/elements/asset-tree/manual-password-dialog.html

@@ -10,5 +10,5 @@
 
 <div style="float: right">
   <button mat-raised-button (click)="onNoClick()" >{{"Cancel"|trans}}</button>
-  <button mat-raised-button color="primary" [mat-dialog-close]="data" >{{"Confirm"|trans}}</button>
+  <button mat-raised-button color="primary" [type]="'submit'" [mat-dialog-close]="data" >{{"Confirm"|trans}}</button>
 </div>

src/app/elements/guacamole/guacamole.component.ts

@@ -73,11 +73,11 @@ export class ElementGuacamoleComponent implements OnInit {
       return null;
     }
 
-    if (!environment.production) {
-      this.target = this._cookie.get('guacamole');
-      NavList.List[this.index].Rdp = this.el.nativeElement;
-      return null;
-    }
+    // if (!environment.production) {
+    //   this.target = this._cookie.get('guacamole');
+    //   NavList.List[this.index].Rdp = this.el.nativeElement;
+    //   return null;
+    // }
     this.registerHost();
   }