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 { ...@@ -38,6 +38,7 @@ export default {
usersName: user.name, usersName: user.name,
source: source.fullName, source: source.fullName,
}, },
false,
); );
} }
......
...@@ -58,7 +58,7 @@ export default { ...@@ -58,7 +58,7 @@ export default {
}, },
computed: { computed: {
modalTitle() { modalTitle() {
return sprintf(this.title, { username: this.username }); return sprintf(this.title, { username: this.username }, false);
}, },
secondaryButtonLabel() { secondaryButtonLabel() {
return s__('AdminUsers|Block user'); return s__('AdminUsers|Block user');
...@@ -112,7 +112,7 @@ export default { ...@@ -112,7 +112,7 @@ export default {
</gl-sprintf> </gl-sprintf>
</p> </p>
<oncall-schedules-list v-if="schedules.length" :schedules="schedules" /> <oncall-schedules-list v-if="schedules.length" :schedules="schedules" :user-name="username" />
<p> <p>
<gl-sprintf :message="s__('AdminUsers|To confirm, type %{username}')"> <gl-sprintf :message="s__('AdminUsers|To confirm, type %{username}')">
......
...@@ -27,9 +27,13 @@ export default { ...@@ -27,9 +27,13 @@ export default {
title() { title() {
return this.isCurrentUser return this.isCurrentUser
? s__('OnCallSchedules|You are currently a part of:') ? s__('OnCallSchedules|You are currently a part of:')
: sprintf(s__('OnCallSchedules|User %{name} is currently part of:'), { : sprintf(
s__('OnCallSchedules|User %{name} is currently part of:'),
{
name: this.userName, name: this.userName,
}); },
false,
);
}, },
footer() { footer() {
return this.isCurrentUser return this.isCurrentUser
......
...@@ -10,6 +10,7 @@ exports[`User Operation confirmation modal renders modal with form included 1`] ...@@ -10,6 +10,7 @@ exports[`User Operation confirmation modal renders modal with form included 1`]
<oncall-schedules-list-stub <oncall-schedules-list-stub
schedules="schedule1,schedule2" schedules="schedule1,schedule2"
username="username"
/> />
<p> <p>
......
...@@ -18,7 +18,7 @@ const mockSchedules = [ ...@@ -18,7 +18,7 @@ const mockSchedules = [
}, },
]; ];
const userName = 'User 1'; const userName = "O'User";
describe('On-call schedules list', () => { describe('On-call schedules list', () => {
let wrapper; 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