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

Don't use ActionView::Helpers::InstanceTag.check_box_checked? anymore #915

Merged
merged 1 commit into from
Jan 31, 2013

Conversation

martijn
Copy link
Contributor

@martijn martijn commented Jan 29, 2013

Even though ActionView::Helpers::InstanceTag exists in Rails 4, the check_box_checked? method is gone, so the defined? check that was put in earlier did not have the desired effect.

I propose to always use our own boolean_checked? method since that works across all Rails versions.

This fixes the rendering of check boxes in Rails 4 (edge Rails).

@sobrinho
Copy link
Member

Seems good.

@justinfrench ?

@justinfrench
Copy link
Member

+1

1 similar comment
@twalpole
Copy link
Contributor

+1

sobrinho added a commit that referenced this pull request Jan 31, 2013
Don't use ActionView::Helpers::InstanceTag.check_box_checked? anymore
@sobrinho sobrinho merged commit 4eaeab1 into formtastic:rails4 Jan 31, 2013
@sobrinho
Copy link
Member

Merged, thanks! ❤️

@twalpole
Copy link
Contributor

@sobrinho - sorry I missed that this pull requests was into the rails4 branch -- the rails4 branch was merged into master a while ago and is out of date now -- we should probably just get rid of the rails4 branch since master passes all tests against rails4

@sobrinho
Copy link
Member

@twalpole sorry, I didn't see this either.

@justinfrench can you make sure that the rails4 branch can be deleted?

@justinfrench
Copy link
Member

@sobrinho @twalpole

$ git lg origin/master..origin/rails4
4eaeab1 Merge pull request #915 from bluerail/rails4
71a3bd2 Don't use ActionView::Helpers::InstanceTag.check_box_checked? anymore

Looks like it's only this PR in rails4 exclusively, so I've merged rails4 into master:

$ git co master
$ git merge rails4
Auto-merging lib/formtastic/inputs/boolean_input.rb
Merge made by the 'recursive' strategy.
 lib/formtastic/inputs/boolean_input.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
$ git push

And I've burned the rails4 branch:

$ git branch -d rails4
Deleted branch rails4 (was 4eaeab1).
$ git push origin :rails4
To git@github.com:justinfrench/formtastic.git
 - [deleted]         rails4

Unsure if anything has to be done with CI, we'll see I guess :)

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.

None yet

4 participants