Skip to content

Commit c71bbb1

Browse files
author
Jon Willesen
committed
disable recording checkbox after conference has started
the recording checkbox should have been disabled after the conference has started, like other conference controls, because you can't change the recording setting after the conference has started. fixes CNVS-8288 test plan: - create a BBB conference, recording checkbox should be editable. - edit the BBB conference, recording checkbox should still be editable. - start the BBB conference, recording checkbox should no longer be editable. Change-Id: I8ee65b45448c9a469516c6c246ea2cbd354e634a Reviewed-on: https://gerrit.instructure.com/24635 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Zach Pendleton <zachp@instructure.com> QA-Review: Cam Theriault <cam@instructure.com> Product-Review: Jon Willesen <jonw@instructure.com>
1 parent 3a4c1c2 commit c71bbb1

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

app/views/jst/conferences/userSettingOptions.handlebars

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@
22
{{#if isBoolean}}
33
<label class="checkbox" for="web_conference_user_settings_{{field}}">
44
<input name="web_conference[user_settings][{{field}}]" type="hidden" value="0">
5-
<input id="web_conference_user_settings_{{field}}" name="web_conference[user_settings][{{field}}]" type="checkbox" value="1" {{#if checked}}checked{{/if}}>
5+
<input
6+
id="web_conference_user_settings_{{field}}"
7+
name="web_conference[user_settings][{{field}}]"
8+
type="checkbox"
9+
value="1"
10+
{{#if ../../conference_started}}disabled="disabled"{{/if}}
11+
{{#if checked}}checked{{/if}}
12+
>
613
{{description}}
714
</label>
815
{{/if}}

public/javascripts/conferences.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ define([
9292
}
9393
$('.web_conference_user_settings').html(userSettingOptionsTemplate({
9494
settings: selected.settings,
95-
conference: conferenceData
95+
conference: conferenceData,
96+
conference_started: !!conferenceData['started_at']
9697
}));
9798
};
9899

0 commit comments

Comments
 (0)