Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
L
luna
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
luna
Commits
95b667ce
Unverified
Commit
95b667ce
authored
5 years ago
by
老广
Committed by
GitHub
5 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #90 from jumpserver/manual
Manual
parents
571b5ecc
613e9639
master
dependabot/npm_and_yarn/handlebars-4.5.3
dependabot/npm_and_yarn/sshpk-1.16.1
dev
gengmei
v52
v54
1.5.6
1.5.5
1.5.4
1.5.3
1.5.2
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
asset-tree.component.ts
src/app/elements/asset-tree/asset-tree.component.ts
+7
-0
manual-password-dialog.html
src/app/elements/asset-tree/manual-password-dialog.html
+4
-1
No files found.
src/app/elements/asset-tree/asset-tree.component.ts
View file @
95b667ce
...
...
@@ -286,6 +286,9 @@ export class ElementAssetTreeComponent implements OnInit, OnChanges {
data
:
{
username
:
user
.
username
}
});
dialogRef
.
afterClosed
().
subscribe
(
result
=>
{
if
(
!
result
)
{
return
;
}
user
.
username
=
btoa
(
result
.
username
);
user
.
password
=
btoa
(
result
.
password
);
return
this
.
login
(
host
,
user
);
...
...
@@ -453,6 +456,10 @@ export class ManualPasswordDialogComponent implements OnInit {
this
.
dialogRef
.
close
();
}
onEnter
()
{
this
.
dialogRef
.
close
(
this
.
data
);
}
ngOnInit
():
void
{
}
}
This diff is collapsed.
Click to expand it.
src/app/elements/asset-tree/manual-password-dialog.html
View file @
95b667ce
...
...
@@ -5,10 +5,13 @@
</mat-form-field>
<mat-form-field
style=
"width: 100%"
>
<input
matInput
[
type
]="'
password
'"
[(
ngModel
)]="
data
.
password
"
[
formControl
]="
PasswordControl
"
placeholder=
"{{'Password'|trans}}"
>
<input
matInput
[
type
]="'
password
'"
[(
ngModel
)]="
data
.
password
"
[
formControl
]="
PasswordControl
"
placeholder=
"{{'Password'|trans}}"
(
keyup
.
enter
)="
onEnter
()"
[
attr
.
cdkFocusInitial
]="
data
.
username
?
true
:
null
"
>
</mat-form-field>
<div
style=
"float: right"
>
<button
mat-raised-button
(
click
)="
onNoClick
()"
>
{{"Cancel"|trans}}
</button>
<button
mat-raised-button
color=
"primary"
[
type
]="'
submit
'"
[
mat-dialog-close
]="
data
"
>
{{"Confirm"|trans}}
</button>
</div>
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment