Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#12334] Instructor courses page: fix copy instructors from other courses modal checkbox #12369

Merged
merged 4 commits into from
Apr 13, 2023
Merged

[#12334] Instructor courses page: fix copy instructors from other courses modal checkbox #12369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
98ffc15
form-check-input class added to checkbox
judith-n Apr 12, 2023
6d621db
CopyInstructorsFromOtherCoursesModalComponent test fixed
judith-n Apr 12, 2023
e8125ac
checkbox appearance matched other in app
judith-n Apr 13, 2023
a4a91f6
Merge branch 'master' into 12334-fix-copy-instructors-from-checkbox
judith-n Apr 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...rses-modal/__snapshots__/copy-instructors-from-other-courses-modal.component.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ exports[`CopyInstructorsFromOtherCoursesModalComponent should snap when instruct
<td>
<div>
<input
class="form-control no-shadow ng-untouched ng-pristine ng-valid"
class="form-check-input no-shadow ng-untouched ng-pristine ng-valid"
id="enabled-checkbox"
type="checkbox"
/>
Expand All @@ -339,7 +339,7 @@ exports[`CopyInstructorsFromOtherCoursesModalComponent should snap when instruct
<td>
<div>
<input
class="form-control no-shadow ng-untouched ng-pristine ng-valid"
class="form-check-input no-shadow ng-untouched ng-pristine ng-valid"
id="enabled-checkbox"
type="checkbox"
/>
Expand Down
4 changes: 2 additions & 2 deletions ...ructors-from-other-courses-modal/copy-instructors-from-other-courses-modal.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ <h4 class="modal-title">Copy Instructors</h4>
<tr *ngFor="let instructorCandidate of course.instructorCandidates">
<td>
<div *ngIf="instructorCandidate.instructor.role === InstructorPermissionRole.INSTRUCTOR_PERMISSION_ROLE_CUSTOM" class="ngb-tooltip-class" ngbTooltip="This instructor has a customised access level and cannot be copied.">
<input disabled type="checkbox" class="form-control no-shadow">
<input disabled type="checkbox" class="form-check-input no-shadow">
</div>
<div *ngIf="instructorCandidate.instructor.role !== InstructorPermissionRole.INSTRUCTOR_PERMISSION_ROLE_CUSTOM">
<input id="enabled-checkbox" [disabled]="isCopyingSelectedInstructors" type="checkbox" class="form-control no-shadow" [(ngModel)]="instructorCandidate.isSelected">
<input id="enabled-checkbox" [disabled]="isCopyingSelectedInstructors" type="checkbox" class="form-check-input no-shadow" [(ngModel)]="instructorCandidate.isSelected">
</div>
</td>
<td>{{ instructorCandidate.instructor.name }}</td>
Expand Down