Skip to content

Commit 554289c

Browse files
authored
Merge pull request #2965 from uw-it-aca/qa
Qa
2 parents 6d65b16 + 36ec06b commit 554289c

File tree

4 files changed

+25
-7
lines changed

4 files changed

+25
-7
lines changed

myuw_vue/components/_common/course/student/course-eval.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
:key="`${section.id}-eval-inst-${index}`"
3737
class="mb-2"
3838
>
39-
<strong>{{ titleCaseName(instructor.instructor_name) }}</strong>
39+
<strong>{{ instructor.instructor_name }}</strong>
4040
<div v-if="hasTitle(instructor)" class="fst-italic text-muted">
4141
{{ instructor.instructor_title }}
4242
</div>
@@ -52,7 +52,7 @@
5252
<a
5353
v-out="'Evaluate instructor'"
5454
:href="evalObj.url">
55-
{{ titleCaseName(instructor.instructor_name) }}
55+
{{ instructor.instructor_name }}
5656
</a>
5757
<div v-if="hasTitle(instructor)"
5858
class="fst-italic text-muted mb-2"

myuw_vue/components/profile/user-name.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<template #panel-body>
44
<h2 class="h4 mb-3">
55
<span>
6-
{{ titleCaseName(name) }}
6+
{{ name }}
77
<span v-if="hasPronouns" class="myuw-text-md text-uppercase" title="Pronouns">
88
({{ titleCaseName(pronouns) }})
99
</span>
@@ -41,7 +41,7 @@ export default {
4141
return Boolean(this.pronouns && this.pronouns.length);
4242
},
4343
name() {
44-
return this.displayName ? this.displayName : this.fullName;
44+
return this.displayName ? this.displayName : this.fullName; // MUWM-5134
4545
},
4646
},
4747
mounted() {

myuw_vue/components/teaching/course/grading/delegates.vue

+10-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
:key="i"
1010
:class="{ 'mb-1': i === section.grade_submission_delegates.length + 1 }"
1111
>
12-
{{ titleCaseName(delegate.person.display_name) }}
12+
{{ delegateDisplayName(delegate.person) }}
1313
({{ titleCaseWord(delegate.level) }})
1414
</li>
1515
</ul>
@@ -78,5 +78,14 @@ export default {
7878
};
7979
},
8080
},
81+
methods: {
82+
delegateDisplayName(delegate) {
83+
// MUWM-5277
84+
if (delegate.display_name) {
85+
return delegate.display_name;
86+
}
87+
return delegate.full_name;
88+
},
89+
},
8190
};
8291
</script>

myuw_vue/components/teaching/course/grading/instructors.vue

+11-2
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
<template #collapsed-body>
1111
<ul class="list-unstyled mb-0">
1212
<li v-for="(instructor, i) in section.instructors" :key="i" class="mb-1">
13-
{{ titleCaseName(instructor.display_name) }}
13+
{{ instructorDisplayName(instructor) }}
1414
</li>
1515
</ul>
1616
</template>
1717
</uw-collapsed-item>
1818

1919
<ul v-else class="list-unstyled mb-0">
2020
<li v-for="(instructor, i) in section.instructors" :key="i" class="mb-1">
21-
{{ titleCaseName(instructor.display_name) }}
21+
{{ instructorDisplayName(instructor) }}
2222
</li>
2323
</ul>
2424
</div>
@@ -75,5 +75,14 @@ export default {
7575
};
7676
},
7777
},
78+
methods: {
79+
instructorDisplayName(instructor) {
80+
// MUWM-5277
81+
if (instructor.display_name) {
82+
return instructor.display_name;
83+
}
84+
return instructor.full_name;
85+
},
86+
},
7887
};
7988
</script>

0 commit comments

Comments
 (0)