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

Main navigation helper should not draw empty navigation labels when there is namespaced models #1197

Merged
merged 1 commit into from
Jun 9, 2012

Conversation

gazay
Copy link
Contributor

@gazay gazay commented Jun 8, 2012

In my project I need to add navigation labels for different scopes of one table. But I didn't find option which will do it for me. So I decided to use namespaced models with default scopes for right navigation labels. But when I set navigation_label for parent model, previous label not disappeared.

I made one spec to show my point - it will not work without changes in main navigation helper.

P.s. thank you for rails admin - it's really great! I definitely will use it again.

@travisbot
Copy link

This pull request passes (merged 7558d28a into 18dfcc4).

@mshibuya
Copy link
Member

mshibuya commented Jun 9, 2012

This breaks CI for Ruby1.8 and Mongoid (though travisbot mysteriously says that it passes).
I guess the problems are Ruby1.9 style hash notation in Comment::Confirmed model and absence of Comment::Confirmed model for Mongoid.
Can you please fix them?

@gazay
Copy link
Contributor Author

gazay commented Jun 9, 2012

Of course, sorry for that) Now on local all tests pass with 1.8.7 and mongoid

@travisbot
Copy link

This pull request passes (merged 1243d22 into 18dfcc4).

mshibuya added a commit that referenced this pull request Jun 9, 2012
Main navigation helper should not draw empty navigation labels when there is namespaced models
@mshibuya mshibuya merged commit b756ea0 into railsadminteam:master Jun 9, 2012
@mshibuya
Copy link
Member

mshibuya commented Jun 9, 2012

Merged!
Thanks for sending pull request!

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.

3 participants