Skip to content

Commit aeacddd

Browse files
committed
adds aria text to indicate course selection is required for conversations
fixes CNVS-19240 note: selection is not mandatory for admins test plan: - as a non-admin, go to compose message in coversations - course menu should read "A course selection is required before entering recipients" - select a course, course menu should now read name of course - return menu to 'Select course' default, the required statement should return - required statement should not read out for admins Change-Id: I1954ef1d48a77990b3dfa111935be3e788f0d0a5 Reviewed-on: https://gerrit.instructure.com/50959 Tested-by: Jenkins Reviewed-by: Andrew Butterfield <abutterfield@instructure.com> QA-Review: Steven Shepherd <sshepherd@instructure.com> Product-Review: Matt Berns <mberns@instructure.com>
1 parent b57d3db commit aeacddd

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

app/coffeescripts/views/conversations/CourseSelectionView.coffee

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ define [
5252
@$el.html(template(data))
5353
@$el.selectpicker('refresh')
5454
@$picker.find('.paginatedLoadingIndicator').remove()
55+
@getAriaLabel()
5556
@createSearchViews()
5657
if !@renderValue() then @loadAll()
5758

@@ -85,9 +86,15 @@ define [
8586
return if @silenced
8687
@_value = @$el.val()
8788
@triggerEvent()
89+
@getAriaLabel()
8890
@searchViews.forEach (view) ->
8991
view.clearSearch()
9092

93+
getAriaLabel: ->
94+
return if _.include(ENV.current_user_roles, 'admin')
95+
label = @getCurrentContext().name || I18n.t("Select course: a selection is required before recipients field will become available")
96+
@$picker.find('button').attr("aria-label", label)
97+
9198
getCurrentContext: ->
9299
matches = @_value.match(/(\w+)_(\d+)/)
93100
return {} unless matches

app/coffeescripts/views/conversations/MessageFormDialog.coffee

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,9 @@ define [
175175
disabled: @model?.get('private')
176176
).render()
177177
@recipientView.on('changeToken', @recipientIdsChanged)
178-
@recipientView.disable(true) unless _.include(ENV.current_user_roles, 'admin')
178+
unless _.include(ENV.current_user_roles, 'admin')
179+
@$messageCourse.attr('aria-required', true)
180+
@recipientView.disable(true)
179181

180182
@$messageCourse.prop('disabled', !!@model)
181183
@courseView = new CourseSelectionView(

app/views/jst/conversations/MessageFormDialog.handlebars

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
<div class='message-header-label'>
3333
<label for="compose-message-course">
3434
{{#t "labels.course"}}Course{{/t}}
35-
<span class="screenreader-only">
36-
{{#t "labels.course_required"}}You must select a Course before entering recipients.{{/t}}
37-
</span>
3835
</label>
3936
</div>
4037
<div class='message-header-input'>

0 commit comments

Comments
 (0)