Skip to content

Commit

Permalink
Resolve MUWM-5349
Browse files Browse the repository at this point in the history
  • Loading branch information
fanglinfang committed Jul 9, 2024
1 parent 7f4377e commit a53631a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ env:
# defined in the "deploy" job
on:
push:
branches: [main, master, qa, develop, vue/dev]
branches: [main, master, qa, develop, fix/MUWM-5349]
pull_request:
branches: [main, master, qa, develop, vue/dev]
branches: [main, master, qa, develop, fix/MUWM-5349]
types: [opened, reopened, synchronize]
release:
branches: [main, master]
Expand Down Expand Up @@ -295,7 +295,7 @@ jobs:
app_instance: dev

- name: Deploy Vue Branch
if: needs.context.outputs.git_repo_branch == 'vue/dev'
if: needs.context.outputs.git_repo_branch == 'fix/MUWM-5349'
uses: uw-it-aca/actions/cicd-deploy@main
with:
release_name: ${{ env.RELEASE_NAME }}
Expand All @@ -313,7 +313,7 @@ jobs:
if: github.event_name == 'push' &&
(endsWith(github.ref, '/main') || endsWith(github.ref, '/master') ||
endsWith(github.ref, '/qa') || endsWith(github.ref, '/develop') ||
endsWith(github.ref, '/vue/dev'))
endsWith(github.ref, '/fix/MUWM-5349'))

needs: [context, build, deploy]

Expand Down
6 changes: 5 additions & 1 deletion myuw_vue/components/academics/adviser.vue
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,11 @@ export default {
);
},
showCard() {
return !this.isPCE && (this.isUndergrad || this.studEmployee && !this.isGrad);
// MUWM-5349
return (
this.profile.class_level != 'GRADUATE' && !this.isGrad && !this.isPCE &&
(this.isUndergrad || this.studEmployee)
);
},
hasAdviser() {
return this.isReadyAdvisers && this.advisers && this.advisers.length > 0;
Expand Down

0 comments on commit a53631a

Please sign in to comment.