Skip to content
This repository has been archived by the owner on Jul 24, 2020. It is now read-only.

529 deactivated users #711

Merged
merged 10 commits into from
Jul 16, 2014
Merged

529 deactivated users #711

merged 10 commits into from
Jul 16, 2014

Conversation

squidgetx
Copy link
Contributor

Resolves #529 by replacing deactivation by banning and unbanning

return true # no phone required if no app config
return true unless AppConfig.first
return true unless AppConfig.first.require_phone
return @csv_import
Copy link
Contributor

Choose a reason for hiding this comment

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

why don't we require that a CSV import meet the require_phone option?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No idea, I'm just refactoring here to match the old behavior. Although that line should probably make sure to return a boolean, eg return !@csv_import.nil?

@orenyk
Copy link
Contributor

orenyk commented Jul 16, 2014

Two inline comments, otherwise this looks great. Nice job!

squidgetx added a commit that referenced this pull request Jul 16, 2014
@squidgetx squidgetx merged commit a287a45 into development Jul 16, 2014
@squidgetx squidgetx deleted the 529_deactivated_users branch July 22, 2014 16:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants