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

Allow claiming of 2i when reviewer has been reset #350

Merged
merged 1 commit into from Jan 15, 2015
Merged

Allow claiming of 2i when reviewer has been reset #350

merged 1 commit into from Jan 15, 2015

Conversation

@fofr
Copy link
Contributor

@fofr fofr commented Jan 15, 2015

Resetting the 2i user through the edit edition form would set the user to an empty string, rather than nil.

  • Update logic to match that used in reviewer.html.erb
  • Include what was a failing test

Fixes https://govuk.zendesk.com/tickets/923214
https://www.agileplannerapp.com/boards/173808/cards/9155

@@ -93,7 +93,7 @@ def update
end

def review
if resource.reviewer
if resource.reviewer and resource.reviewer.present?

This comment has been minimized.

@alext

alext Jan 15, 2015
Contributor

You don't need the and clause here, this line could just be if resource.reviewer.present?.

@alext
Copy link
Contributor

@alext alext commented Jan 15, 2015

minor style point, otherwise looks good.

Resetting the 2i user through the edit edition form would set the user
to an empty string, rather than nil.

* Update logic to match that used in reviewer.html.erb
* Include what was a failing test
@fofr fofr force-pushed the fix-claim-2i branch from d9cfe9f to dcfdfb1 Jan 15, 2015
@fofr
Copy link
Contributor Author

@fofr fofr commented Jan 15, 2015

@alext Thanks, I've updated.

@alext
Copy link
Contributor

@alext alext commented Jan 15, 2015

Good to merge when green.

fofr added a commit that referenced this pull request Jan 15, 2015
Allow claiming of 2i when reviewer has been reset
@fofr fofr merged commit 924b74b into master Jan 15, 2015
1 check passed
1 check passed
default "Build #592 succeeded on Jenkins"
Details
@fofr fofr deleted the fix-claim-2i branch Jan 15, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.