Skip to content

Commit 67f114b

Browse files
committed
rebase
1 parent 57b37f0 commit 67f114b

File tree

7 files changed

+173
-148
lines changed

7 files changed

+173
-148
lines changed

frontend/app/components/encryptable/form.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ export default class Form extends BaseFormComponent {
108108
get availableFolders() {
109109
return isPresent(this.selectedTeam)
110110
? this.store
111-
.peekAll("folder")
112-
.filter(
113-
(folder) => folder.team.get("id") === this.selectedTeam.get("id")
114-
)
111+
.peekAll("folder")
112+
.filter(
113+
(folder) => folder.team.get("id") === this.selectedTeam.get("id")
114+
)
115115
: [];
116116
}
117117

frontend/app/templates/components/encryptable/row.hbs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@
5656
<Input class="d-inline form-control" id="input-password-{{@encryptable.id}}" @disabled="true" @value={{format-cleartext @encryptable "username"}}/>
5757
<a role="button"
5858
class="show-text show-text-sm bg-light-blue no-wrap overflow-hidden d-flex align-items-center text-muted {{if this.isUsernameVisible "visibility-hidden"}}"
59-
{{on "click" (action this.showAttribute "username")}}>
59+
{{on "click" (action this.showAttribute "username")}}>
6060
{{t "encryptable/credentials.show.show_username"}}
6161
</a>
6262
</div>
6363
</div>
6464
<div class="col px-0 d-none d-md-block encryptable-row-copy-button">
6565
<button class="btn btn-light copy-btn" {{on "click" (action this.copyAttribute "username")}}
66-
disabled={{@encryptable.isUsernameBlank}} >
66+
disabled={{@encryptable.isUsernameBlank}} >
6767
<img class="icon-clippy img d-inline" src="/assets/images/clipboard.svg" alt="clip">
6868
{{#unless @encryptable.isUsernameBlank}}
6969
<BsTooltip @title={{t "encryptable/credentials.show.copy_username"}} @delayShow="500" />
@@ -77,14 +77,14 @@
7777
<Input class="d-inline form-control" id="input-password-{{@encryptable.id}}" @disabled="true" @value={{format-cleartext @encryptable "email"}}/>
7878
<a role="button"
7979
class="show-text show-text-sm bg-light-blue no-wrap overflow-hidden d-flex align-items-center text-muted {{if this.isEmailVisible "visibility-hidden"}}"
80-
{{on "click" (action this.showAttribute "email")}}>
80+
{{on "click" (action this.showAttribute "email")}}>
8181
{{t "encryptable/credentials.show.show_email"}}
8282
</a>
8383
</div>
8484
</div>
8585
<div class="col px-0 d-none d-md-block encryptable-row-copy-button">
8686
<button class="btn btn-light copy-btn" {{on "click" (action this.copyAttribute "email")}}
87-
disabled={{@encryptable.isEmailBlank}} >
87+
disabled={{@encryptable.isEmailBlank}} >
8888
<img class="icon-clippy img d-inline" src="/assets/images/clipboard.svg" alt="clip">
8989
{{#unless @encryptable.isEmailBlank}}
9090
<BsTooltip @title={{t "encryptable/credentials.show.copy_email"}} @delayShow="500" />
@@ -101,7 +101,7 @@
101101
</div>
102102
<div class="col pl-0 d-none d-md-block encryptable-row-copy-button">
103103
<button class="btn btn-light copy-btn" {{on "click" (action this.copyAttribute "password")}}
104-
disabled={{@encryptable.isPasswordBlank}} >
104+
disabled={{@encryptable.isPasswordBlank}} >
105105
<img class="icon-clippy img d-inline" src="/assets/images/clipboard.svg" alt="clip">
106106
{{#unless @encryptable.isPasswordBlank}}
107107
<BsTooltip @title={{t "encryptable/credentials.show.copy_password"}} @delayShow="500" />
@@ -118,7 +118,7 @@
118118
</div>
119119
<div class="col pl-0 d-none d-md-block encryptable-row-copy-button">
120120
<button class="btn btn-light copy-btn" {{on "click" (action this.copyAttribute "token")}}
121-
disabled={{@encryptable.isTokenBlank}} >
121+
disabled={{@encryptable.isTokenBlank}} >
122122
<img class="icon-clippy img d-inline" src="/assets/images/clipboard.svg" alt="clip">
123123
{{#unless @encryptable.isTokenBlank}}
124124
<BsTooltip @title={{t "encryptable/credentials.show.copy_token"}} @delayShow="500" />
@@ -135,7 +135,7 @@
135135
</div>
136136
<div class="col pl-0 d-none d-md-block encryptable-row-copy-button">
137137
<button class="btn btn-light copy-btn" {{on "click" (action this.copyAttribute "pin")}}
138-
disabled={{@encryptable.isPinBlank}} >
138+
disabled={{@encryptable.isPinBlank}} >
139139
<img class="icon-clippy img d-inline" src="/assets/images/clipboard.svg" alt="clip">
140140
{{#unless @encryptable.isPinBlank}}
141141
<BsTooltip @title={{t "encryptable/credentials.show.copy_pin"}} @delayShow="500" />
@@ -152,14 +152,18 @@
152152
</div>
153153
<div class="col pl-0 d-none d-md-block encryptable-row-copy-button">
154154
<button class="btn btn-light copy-btn" {{on "click" (action this.copyAttribute "customAttr")}}
155-
disabled={{@encryptable.isCustomAttrBlank}} >
155+
disabled={{@encryptable.isCustomAttrBlank}} >
156156
<img class="icon-clippy img d-inline" src="/assets/images/clipboard.svg" alt="clip">
157157
{{#unless @encryptable.isCustomAttrBlank}}
158158
<BsTooltip @title={{t "encryptable/credentials.show.copy_custom_attr"}} @delayShow="500" />
159159
{{/unless}}
160160
</button>
161161
</div>
162162
{{/if}}
163+
{{else}}
164+
<LinkTo class="col-4 underline-hover break-words account-link" @route="encryptables.show" @model={{@encryptable.id}}>
165+
{{t "encryptable/credentials.row.clickToSeeAttrs"}}
166+
</LinkTo>
163167
{{/if}}
164168
<div class="col-md-auto d-none d-md-block encryptable-row-icons ml-auto">
165169
{{#unless @encryptable.isOseSecret}}

0 commit comments

Comments
 (0)