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

Send language_id (of the currently editing page) parameter to Pages API requests for page select on link overlay #2439

Merged
merged 1 commit into from
Jun 5, 2023

Conversation

dbwinger
Copy link
Contributor

What is this pull request for?

Describe you pull request here...
API::PagesController#index defaults to filtering to Pages from Alchemy::Language.current if language_id is not given. The language_id of the page being edited should be given.

Checklist

  • I have followed Pull Request guidelines
  • I have added a detailed description into each commit message
  • I have added tests to cover this change

dbwinger referenced this pull request Mar 20, 2023
We were missing a third argument in order to be able to use this
permission with the `.accessible_by` scope.
@tvdeyen tvdeyen requested a review from mamhoff April 4, 2023 14:10
@github-actions
Copy link

github-actions bot commented Jun 4, 2023

This pull request has not seen any activiy in a long time.
Probably because of missing tests or a necessary rebase.
This PR will be closed in 7 days if no further activity happens.

@github-actions github-actions bot added the Stale label Jun 4, 2023
@tvdeyen
Copy link
Member

tvdeyen commented Jun 4, 2023

@dbwinger sorry, this totally slipped out of my radar. Could you please rebase this with latest main branch? Thanks

@dbwinger dbwinger force-pushed the link-dialog-lang branch from 8aef75a to 314d74e Compare June 4, 2023 19:30
@tvdeyen tvdeyen removed the Stale label Jun 4, 2023
@tvdeyen
Copy link
Member

tvdeyen commented Jun 4, 2023

@dbwinger thanks. The spec error seems to be related. Mind taking another look?

@dbwinger
Copy link
Contributor Author

dbwinger commented Jun 4, 2023

@tvdeyen Yeah, I'll get it fixed tomorrow.

@dbwinger dbwinger force-pushed the link-dialog-lang branch from a79e926 to f695769 Compare June 5, 2023 15:36
@dbwinger
Copy link
Contributor Author

dbwinger commented Jun 5, 2023

@dbwinger thanks. The spec error seems to be related. Mind taking another look?

Should be ready to go now.

Copy link
Member

@tvdeyen tvdeyen left a comment

Choose a reason for hiding this comment

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

Nice. Thank you very much

@tvdeyen tvdeyen merged commit 0cd41cd into AlchemyCMS:main Jun 5, 2023
@tvdeyen
Copy link
Member

tvdeyen commented Jun 28, 2023

This broke the page link in TinyMCE editor instances.

@dbwinger
Copy link
Contributor Author

This broke the page link in TinyMCE editor instances.

Ok, I'll take a look ASAP.

@tvdeyen
Copy link
Member

tvdeyen commented Jun 28, 2023 via email

@dbwinger
Copy link
Contributor Author

Ok. Would it be helpful for me to submit a PR or is it easier for you to handle it? If you'd like me to, are you thinking it would be best done inside the existing script tag of app/views/alchemy/admin/pages/edit.html.erb?

@tvdeyen
Copy link
Member

tvdeyen commented Jun 28, 2023

I can handle it. Already started looking into it anyway 😉

@dbwinger
Copy link
Contributor Author

dbwinger commented Jun 28, 2023 via email

@tvdeyen
Copy link
Member

tvdeyen commented Jun 30, 2023

@dbwinger I think we need to revert this. I totally forgot that we return all pages from the API on purpose. As already discussed in #2258

The actual issue was introduced in c98605a where we started to scope the pages to the language again. I will revert this change as well.

tvdeyen added a commit to tvdeyen/alchemy_cms that referenced this pull request Jun 30, 2023
… Pages API requests for page select on link overlay"

We need to revert the change made in AlchemyCMS#2439. We return all pages from the API on purpose. As already discussed in AlchemyCMS#2258

The actual issue was introduced in c98605a where we started to scope the pages to the language again. This change needs to be reverted as well.

This reverts commit f695769.
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.

2 participants