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.

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

Customize ContentUnavailablePage for different roles and change its URL #7850

Merged
merged 2 commits into from
Mar 16, 2021

Conversation

kmrinal19
Copy link
Contributor

@kmrinal19 kmrinal19 commented Mar 12, 2021

Summary

This pull request incorporates following changes:

  • Show learnerText message only if the user has the Learner role (and does not have the "can manage content role").
  • Fix punctuation in the import channels link text for admin.
  • Change URL of the ContentUnavailablePage from content-unavailable to resources-unavailable.

http://localhost:8000/en/learn/#/resources-unavailable when viewed from admin account

resource-unavailable-admin

http://localhost:8000/en/learn/#/resources-unavailable when viewed from learner account

resource-unavailable-learner

References

Fixes #7694

Contributor Checklist

PR process:

  • PR has the correct target branch and milestone
  • PR has 'needs review' or 'work-in-progress' label
  • If PR is ready for review, a reviewer has been added. (Don't use 'Assignees')
  • If this is an important user-facing change, PR or related issue has a 'changelog' label
  • If this includes an internal dependency change, a link to the diff is provided

Testing:

  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Critical and brittle code paths are covered by unit tests

Reviewer Checklist

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

@kmrinal19 kmrinal19 changed the title Content unavailable Customize ContentUnavailablePage for different roles and change its URL Mar 12, 2021
Copy link
Contributor

@jonboiser jonboiser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks!

@jonboiser jonboiser merged commit 4b229b9 into learningequality:develop Mar 16, 2021
@jonboiser jonboiser added the changelog Important user-facing changes label Mar 16, 2021
@jonboiser jonboiser added this to the 0.15.0 milestone Mar 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog Important user-facing changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Copy on ContentUnavailablePage is not customized to different roles (and has minor English punctuation issue)
2 participants