Commit 7aa7cae1 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '330725-do-not-escape-special-chars' into 'master'

Fix escaped chars in remove and delete modals

See merge request gitlab-org/gitlab!65990
parents d45cc75a f8466bc5
......@@ -38,6 +38,7 @@ export default {
usersName: user.name,
source: source.fullName,
},
false,
);
}
......
......@@ -58,7 +58,7 @@ export default {
},
computed: {
modalTitle() {
return sprintf(this.title, { username: this.username });
return sprintf(this.title, { username: this.username }, false);
},
secondaryButtonLabel() {
return s__('AdminUsers|Block user');
......@@ -112,7 +112,7 @@ export default {
</gl-sprintf>
</p>
<oncall-schedules-list v-if="schedules.length" :schedules="schedules" />
<oncall-schedules-list v-if="schedules.length" :schedules="schedules" :user-name="username" />
<p>
<gl-sprintf :message="s__('AdminUsers|To confirm, type %{username}')">
......
......@@ -27,9 +27,13 @@ export default {
title() {
return this.isCurrentUser
? s__('OnCallSchedules|You are currently a part of:')
: sprintf(s__('OnCallSchedules|User %{name} is currently part of:'), {
name: this.userName,
});
: sprintf(
s__('OnCallSchedules|User %{name} is currently part of:'),
{
name: this.userName,
},
false,
);
},
footer() {
return this.isCurrentUser
......
......@@ -10,6 +10,7 @@ exports[`User Operation confirmation modal renders modal with form included 1`]
<oncall-schedules-list-stub
schedules="schedule1,schedule2"
username="username"
/>
<p>
......
......@@ -18,7 +18,7 @@ const mockSchedules = [
},
];
const userName = 'User 1';
const userName = "O'User";
describe('On-call schedules list', () => {
let wrapper;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment