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

[Conflict Resolver] Filters: displaying user projects and sites #7535

Conversation

laemtl
Copy link
Contributor

@laemtl laemtl commented Aug 16, 2021

This PR:

  1. Migrates the filter helpers from \DataFrameworkMenu to \NDB_Menu_Filter and add an $allsitesPermission parameter in getSiteOptions, since the PHP classes do not extend DataFrameworkMenu.
  2. Modifies the way project/subproject/site filters are populated. Now those filters are displayed with values the current user has permission for.
  3. Fixes the data table to remove entries for Projects and Sites the user does not have access to.
  4. Fixes the integration tests

To test

  • Visit the module and check that all data entries belong to sites and projects the user has access to.
  • Visit the module and check that the site/project/subproject menu filters contain entries the user has access to.

Related to #6829
Related to #6729

@laemtl laemtl changed the title Displaying user projects and sites for filters [Conflict Resolver] Displaying user projects and sites for filters Aug 16, 2021
laemtl added a commit to laemtl/Loris that referenced this pull request Aug 16, 2021
@laemtl laemtl force-pushed the 2021-08-16-conflict-resolver-user-project-filter branch 2 times, most recently from 3500497 to b4bb8c3 Compare August 16, 2021 19:00
@laemtl
Copy link
Contributor Author

laemtl commented Aug 16, 2021

@driusan Since the migration of getSiteOptions and getprojectOptions in DataFrameworkMenu per your suggestion, the methods are not accessible to some modules not extending it like this one. Since multiple inheritance is not possible in PHP, migrating the methods in NDB_Menu_Filter fixes the problem.

@laemtl laemtl force-pushed the 2021-08-16-conflict-resolver-user-project-filter branch from b4bb8c3 to 7dfc17d Compare August 16, 2021 20:53
@laemtl laemtl force-pushed the 2021-08-16-conflict-resolver-user-project-filter branch from 7dfc17d to 27821bc Compare August 18, 2021 02:25
@laemtl laemtl force-pushed the 2021-08-16-conflict-resolver-user-project-filter branch from 27821bc to ec2d212 Compare August 18, 2021 03:00
@cmadjar cmadjar added the State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) label Nov 29, 2022
@laemtl laemtl self-assigned this Dec 20, 2022
@laemtl laemtl added this to the 25.0.0 milestone Feb 28, 2023
@laemtl laemtl added the State: Needs work PR awaiting additional work by the author to proceed label Mar 16, 2023
@laemtl laemtl closed this Mar 20, 2023
@laemtl laemtl deleted the 2021-08-16-conflict-resolver-user-project-filter branch March 20, 2023 18:15
@laemtl laemtl changed the title [Conflict Resolver] Displaying user projects and sites for filters [Conflict Resolver] Filters: displaying user projects and sites Mar 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
State: Needs rebase PR that needs to be rebased to proceed (conflicts, wrong branch...) State: Needs work PR awaiting additional work by the author to proceed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants