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

Issue #SB-000 merge: Merge branch 'release-4.10.7' into release-5.0.0 #3187

Merged
merged 3 commits into from
Sep 23, 2022
Merged

Issue #SB-000 merge: Merge branch 'release-4.10.7' into release-5.0.0 #3187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67184d9
Issue #SB-0000 fix: login is enabled for student
vpPavithra Sep 7, 2022
00c2afd
Issue #SB-0000 merge: Merge pull request #3167 from vpPavithra/relea…
swayangjit Sep 8, 2022
40486a2
Issue #SB-000 merge: Merge branch 'release-4.10.7' into release-5.0.0
swayangjit Sep 23, 2022
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
5 changes: 2 additions & 3 deletions src/app/components/application-header/application-header.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,9 +521,8 @@ export class ApplicationHeaderComponent implements OnInit, OnDestroy {

private refreshLoginInButton() {
const profileType = this.appGlobalService.getGuestUserType();
this.showLoginButton = (this.commonUtilService.isAccessibleForNonStudentRole(profileType)
&& this.appGlobalService.DISPLAY_SIGNIN_FOOTER_CARD_IN_PROFILE_TAB_FOR_TEACHER) ||
(profileType === ProfileType.STUDENT && this.appGlobalService.DISPLAY_SIGNIN_FOOTER_CARD_IN_PROFILE_TAB_FOR_STUDENT);
this.showLoginButton = this.appGlobalService.DISPLAY_SIGNIN_FOOTER_CARD_IN_PROFILE_TAB_FOR_TEACHER ||
this.appGlobalService.DISPLAY_SIGNIN_FOOTER_CARD_IN_PROFILE_TAB_FOR_STUDENT;
}

private async checkCurrentOrientation() {
Expand Down
5 changes: 2 additions & 3 deletions src/app/profile/guest-profile/guest-profile.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,8 @@ export class GuestProfilePage implements OnInit {
refreshSignInCard() {
const profileType = this.appGlobalService.getGuestUserType();

if ((this.commonUtilService.isAccessibleForNonStudentRole(profileType)
&& this.appGlobalService.DISPLAY_SIGNIN_FOOTER_CARD_IN_PROFILE_TAB_FOR_TEACHER) ||
(profileType === ProfileType.STUDENT && this.appGlobalService.DISPLAY_SIGNIN_FOOTER_CARD_IN_PROFILE_TAB_FOR_STUDENT)) {
if (this.appGlobalService.DISPLAY_SIGNIN_FOOTER_CARD_IN_PROFILE_TAB_FOR_TEACHER ||
this.appGlobalService.DISPLAY_SIGNIN_FOOTER_CARD_IN_PROFILE_TAB_FOR_STUDENT) {
this.showSignInCard = true;
} else {
this.showSignInCard = false;
Expand Down