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

collection: add individual researcher message #1575

Merged
merged 4 commits into from
Feb 21, 2020

Conversation

diegoviola
Copy link
Contributor

No description provided.

@diegoviola diegoviola force-pushed the 1560-individual-researcher-message branch 3 times, most recently from 73e3d0b to 4396ca2 Compare January 10, 2020 03:32
Copy link
Collaborator

@saracarl saracarl left a comment

Choose a reason for hiding this comment

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

  1. The logic should be "show the warning OR show the collection creation form" -- right now, we are showing both to individual researchers. So they can ignore the warning and go ahead and create a collection, which I don't want.

  2. Remove the comma from this string:
    To upgrade your account, contact support@fromthepage.com.
    becomes
    To upgrade your account contact support@fromthepage.com.

@saracarl
Copy link
Collaborator

Tests passed locally, though!

@diegoviola diegoviola force-pushed the 1560-individual-researcher-message branch 12 times, most recently from e985b7b to 0dd027b Compare January 16, 2020 18:12
@diegoviola diegoviola force-pushed the 1560-individual-researcher-message branch from 0dd027b to 7158706 Compare January 21, 2020 20:52
@benwbrum benwbrum assigned diegoviola and unassigned benwbrum Jan 22, 2020
@benwbrum
Copy link
Owner

We still need to hide the form if we display the warning message.

@diegoviola
Copy link
Contributor Author

@benwbrum done.

Note that I had to change the account_type to "Trial" for those specific tests, otherwise the form gets disabled and causes the tests to break.

@diegoviola diegoviola assigned benwbrum and unassigned diegoviola Jan 30, 2020
@benwbrum benwbrum linked an issue Feb 21, 2020 that may be closed by this pull request
@benwbrum benwbrum merged commit faada3d into fromthepage.com Feb 21, 2020
@benwbrum benwbrum deleted the 1560-individual-researcher-message branch February 21, 2020 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Limit individual researcher collection count
3 participants