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

In case of just one project inside a group, show "No more project for this group" #590

Merged
merged 1 commit into from
Mar 1, 2024

Conversation

volterra79
Copy link
Member

Instead of skip and show parent group/macrogroup, when click on Change Map button, show No more project for this group

Before:

Screenshot from 2024-03-01 15-12-48

After:

Screenshot from 2024-03-01 15-12-05

and after click on back arrow

Screenshot from 2024-03-01 15-12-48

@volterra79 volterra79 added this to the v3.10 milestone Mar 1, 2024
@volterra79 volterra79 requested review from leolami and Raruto March 1, 2024 14:14
@volterra79 volterra79 self-assigned this Mar 1, 2024
volterra79 added a commit to g3w-suite/g3w-admin that referenced this pull request Mar 1, 2024
@volterra79 volterra79 mentioned this pull request Mar 1, 2024
@leolami leolami closed this Mar 1, 2024
@volterra79 volterra79 reopened this Mar 1, 2024
@volterra79 volterra79 merged commit deaab4a into dev Mar 1, 2024
4 checks passed
@volterra79 volterra79 deleted the change_map_menu_one_project_inside_group branch March 1, 2024 16:41
github-actions bot pushed a commit that referenced this pull request Mar 1, 2024
…se of just one project inside a group (#590)

(cherry picked from commit deaab4a)
Copy link

github-actions bot commented Mar 1, 2024

The backport to v3.8.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-v3.8.x v3.8.x
# Navigate to the new working tree
cd .worktrees/backport-v3.8.x
# Create a new branch
git switch --create backport-590-to-v3.8.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 deaab4ac89405372779822097463e1dae700e1e9
# Push it to GitHub
git push --set-upstream origin backport-590-to-v3.8.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-v3.8.x

Then, create a pull request where the base branch is v3.8.x and the compare/head branch is backport-590-to-v3.8.x.

volterra79 added a commit that referenced this pull request Mar 1, 2024
…se of just one project inside a group (#590) (#592)

(cherry picked from commit deaab4a)

Co-authored-by: Francesco Boccacci <boccacci.francesco@gmail.com>
wlorenzetti added a commit to g3w-suite/g3w-admin that referenced this pull request Mar 4, 2024
* Add `macrogroup_id` to group serializer.

* 🐛 Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client@ebb57cd

* Typo: fix 'nomacrogroup' filter.

* Typo.

* Fix testing.

* 🐛 Client
 g3w-suite/g3w-client#590

---------

Co-authored-by: wlorenzetti <lorenzett@gis3w.it>
Co-authored-by: volterra79 <boccacci.francesco@gmail.com>
Co-authored-by: Raruto <Raruto@users.noreply.github.com>
wlorenzetti added a commit to g3w-suite/g3w-admin that referenced this pull request Mar 4, 2024
* Add `macrogroup_id` to group serializer.

* 🐛 Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client@ebb57cd

* Typo: fix 'nomacrogroup' filter.

* Typo.

* Fix testing.

* 🐛 Client
 g3w-suite/g3w-client#590

---------

Co-authored-by: wlorenzetti <lorenzett@gis3w.it>
Co-authored-by: volterra79 <boccacci.francesco@gmail.com>
Co-authored-by: Raruto <Raruto@users.noreply.github.com>
(cherry picked from commit ee5486e)
wlorenzetti added a commit to g3w-suite/g3w-admin that referenced this pull request Mar 4, 2024
* Add `macrogroup_id` to group serializer.

* 🐛 Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client@ebb57cd

* Typo: fix 'nomacrogroup' filter.

* Typo.

* Fix testing.

* 🐛 Client
 g3w-suite/g3w-client#590

---------

Co-authored-by: wlorenzetti <lorenzett@gis3w.it>
Co-authored-by: volterra79 <boccacci.francesco@gmail.com>
Co-authored-by: Raruto <Raruto@users.noreply.github.com>
(cherry picked from commit ee5486e)
volterra79 added a commit that referenced this pull request Mar 4, 2024
volterra79 added a commit that referenced this pull request Mar 4, 2024
* 🔙 from #579 - Click to go back button to show MacroGroup list from Group page within ChangeMapMenu.vue

* 🔙 from #590 - In case of just one project inside a group, show "No more project for this group"
wlorenzetti added a commit to g3w-suite/g3w-admin that referenced this pull request Mar 4, 2024
* Add `macrogroup_id` to group serializer. (#761)

* Add `macrogroup_id` to group serializer.

* 🐛 Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client@ebb57cd

* Typo: fix 'nomacrogroup' filter.

* Typo.

* Fix testing.

* 🐛 Client
 g3w-suite/g3w-client#590

---------

Co-authored-by: wlorenzetti <lorenzett@gis3w.it>
Co-authored-by: volterra79 <boccacci.francesco@gmail.com>
Co-authored-by: Raruto <Raruto@users.noreply.github.com>
(cherry picked from commit ee5486e)

* ⬆️ Client
  ⬆️ Bump g3w-client v3.9.4 and g3w-client-plugin-qplotly v3.7.1
  - https://github.com/g3w-suite/g3w-client/releases/tag/v3.9.4
  - https://github.com/g3w-suite/g3w-client-plugin-qplotly/releases/tag/v3.7.1

* Fix for QGIS server >= 3.28

---------

Co-authored-by: volterra79 <boccacci.francesco@gmail.com>
Co-authored-by: wlorenzetti <lorenzett@gis3w.it>
wlorenzetti added a commit to g3w-suite/g3w-admin that referenced this pull request Mar 4, 2024
* Add `macrogroup_id` to group serializer. (#761)

* Add `macrogroup_id` to group serializer.

* 🐛 Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client#579

* ✨ Client
  g3w-suite/g3w-client@ebb57cd

* Typo: fix 'nomacrogroup' filter.

* Typo.

* Fix testing.

* 🐛 Client
 g3w-suite/g3w-client#590

---------

Co-authored-by: wlorenzetti <lorenzett@gis3w.it>
Co-authored-by: volterra79 <boccacci.francesco@gmail.com>
Co-authored-by: Raruto <Raruto@users.noreply.github.com>
(cherry picked from commit ee5486e)

* For QGIS server version >= 3.28

* Fix merge.

* ⬆️ Client
  ⬆️ Bump g3w-client v3.8.17 https://github.com/g3w-suite/g3w-client/releases/tag/v3.8.17

---------

Co-authored-by: wlorenzetti <lorenzett@gis3w.it>
Co-authored-by: volterra79 <boccacci.francesco@gmail.com>
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.

2 participants