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

Use a dedicated helper to check current controller action in views #1425 #1428

Merged
merged 4 commits into from
Mar 7, 2025

Conversation

MontrealSergiy
Copy link
Contributor

@MontrealSergiy MontrealSergiy commented Sep 6, 2024

Refactor action checking.

for details see #1425

a separate commit contains few simplifications of the related NeuroHub code

@MontrealSergiy MontrealSergiy self-assigned this Sep 6, 2024
@MontrealSergiy MontrealSergiy changed the title Use a dedicated helper to check current controller action in views Use a dedicated helper to check current controller action in views #1425 Sep 6, 2024
@MontrealSergiy MontrealSergiy changed the base branch from master to dev September 17, 2024 12:54
Copy link
Member

@prioux prioux left a comment

Choose a reason for hiding this comment

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

This PR needs to be rebased, it contains tons of changes that are from other commits. Are you sure you started with the latest HEADs, originally?

@MontrealSergiy MontrealSergiy changed the base branch from dev to master March 4, 2025 15:56
@MontrealSergiy
Copy link
Contributor Author

This PR needs to be rebased, it contains tons of changes that are from other commits. Are you sure you started with the latest HEADs, originally?

I guess I got confused should PR go to dev or master. I switched it to master, which seems to be the current policy, so irrelevant staff does not show now. Should I still do something else?

Copy link
Member

@prioux prioux left a comment

Choose a reason for hiding this comment

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

Check my comments, I think there is only one bug.

@prioux
Copy link
Member

prioux commented Mar 7, 2025

There is now a conflict because this PR changes one line in data_providers/new.html.erb that was also modified by a PR merged yesterday! Just fix manually please so we can merge.

@MontrealSergiy
Copy link
Contributor Author

fixing, not sure did it work, will check in a min

@prioux
Copy link
Member

prioux commented Mar 7, 2025

I think it worked. I'll merge the PR once the tests have finished.

@prioux prioux merged commit f6b8289 into aces:master Mar 7, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Replace control and action checks in page view code with page_is?()
2 participants