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

Reader: make the unauthorized error message appear below the "Oops!" heading #2680

Merged
merged 1 commit into from
Jan 22, 2016

Conversation

designsimply
Copy link
Contributor

This pull request seeks to make the unauthorized error message appear below the "Oops!" heading as it should when someone tries to view a post in the Reader for a private site they are not authorized to see.

See 8753-gh-calypso-pre-oss for testing steps.

Before:

screen shot 2016-01-21 at thu jan 21 7 19 53 pm

After:

screen shot 2016-01-21 at thu jan 21 7 41 31 pm

or with "reader/full-errors": true (i.e. local Calypso install)

screen shot 2016-01-21 at thu jan 21 7 44 55 pm

@designsimply designsimply added [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. [Feature] Reader The reader site on Calypso. labels Jan 22, 2016
@@ -16,13 +16,13 @@ var PostUnavailable = React.createClass( {

componentWillMount: function() {
this.errors = {
403: this.translate( 'This is a private site. You’re following the site, but not currently a member. Please request membership to display these posts in Reader.' ),
'unauthorized': this.translate( 'This is a private site. You’re following the site, but not currently a member. Please request membership to display these posts in Reader.' ),
Copy link
Contributor

Choose a reason for hiding this comment

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

While we're here, maybe change this to "this post" from "these posts" since the error applies to one post?

Also fix up the wording a bit and default to the default message if a code is passed, but we don't have a message for it.
@blowery blowery force-pushed the fix/oops-for-unauthorized-reader-views branch from 1bdccf2 to 01c870b Compare January 22, 2016 01:29
@blowery
Copy link
Contributor

blowery commented Jan 22, 2016

👍 will ship it. I made some minor changes to make it even more robust and fixed the wording. Still your commit though.

congrats @designsimply, nice work!

@blowery blowery added [Status] Ready to Merge and removed [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. labels Jan 22, 2016
@blowery blowery added this to the Reader: UI Nits milestone Jan 22, 2016
@designsimply
Copy link
Contributor Author

Thanks! /ht @bluefuton for help and explanations along the way too!!

blowery added a commit that referenced this pull request Jan 22, 2016
…ader-views

Reader: make the unauthorized error message appear below the "Oops!" heading
@blowery blowery merged commit 96a9de8 into master Jan 22, 2016
@blowery blowery deleted the fix/oops-for-unauthorized-reader-views branch January 22, 2016 01:38
@lancewillett
Copy link
Contributor

Nice one, Sheri! 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Feature] Reader The reader site on Calypso.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants