WIP: Draft: Resolve "Adapt ChipSelectField" #3582

Draft
yuha wants to merge 1 commit from 1353-adapt-chipselectfield into master
Member

Information and screenshots

No further information have been provided.

Checklist

  • tox -e reformat,lint used
  • Changelog updated/No update necessary
  • Documentation (incl. Screenshots) up-to-date
  • Copyright in apps.py and README.rst up-to-date
  • (Unit) tests for new feature/regression tests for bug fixes (only if useful)
  • Adhere to URL scheme
  • Tested with admin account
  • Tested with normal account (based on permissions)

Backend checklist

  • Use permissions for all GraphQL mutations
  • Use query optimizer for all GraphQL queries
  • Don't use inefficient DB queries

Frontend checklist (mandatory with ~"part::frontend")

  • Screenshots are attached (mobile and desktop)
  • Tested on mobile, tablet, and desktop sizes
  • Adhered to frontend guidelines
  • Checked with Firefox Accessibility Checker

Closes #1353

## Information and screenshots No further information have been provided. ## Checklist - [ ] `tox -e reformat,lint` used - [ ] Changelog updated/No update necessary - [ ] Documentation (incl. Screenshots) up-to-date - [ ] Copyright in `apps.py` and `README.rst` up-to-date - [ ] (Unit) tests for new feature/regression tests for bug fixes (only if useful) - [ ] Adhere to [URL scheme](https://edugit.org/AlekSIS/official/AlekSIS/-/issues/86) - [ ] Tested with admin account - [ ] Tested with normal account (based on permissions) ## Backend checklist - [ ] Use permissions for all GraphQL mutations - [ ] Use query optimizer for all GraphQL queries - [ ] Don't use inefficient DB queries ## Frontend checklist (mandatory with ~"part::frontend") - [ ] Screenshots are attached (mobile and desktop) - [ ] Tested on mobile, tablet, and desktop sizes - [ ] Adhered to frontend guidelines - [ ] Checked with Firefox Accessibility Checker Closes #1353
Author
Member

assigned to @yuha

assigned to @yuha
Author
Member

added 1 commit

  • 22682762 - WIP: Adapt chip select field

Compare with previous version

added 1 commit <ul><li>22682762 - WIP: Adapt chip select field</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1937/diffs?diff_id=71204&start_sha=8203eda2da96a8d8c701293a1f72bf329f0cc985)
Author
Member

added 1 commit

Compare with previous version

added 1 commit <ul><li>3fe3eacc - WIP: Adapt chip select field</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1937/diffs?diff_id=71369&start_sha=22682762397013140e83aa93e911d666e3f91983)
This pull request has changes conflicting with the target branch.
  • aleksis/core/frontend/components/generic/forms/ChipSelectField.vue
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 1353-adapt-chipselectfield:1353-adapt-chipselectfield
git switch 1353-adapt-chipselectfield

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff 1353-adapt-chipselectfield
git switch 1353-adapt-chipselectfield
git rebase master
git switch master
git merge --ff-only 1353-adapt-chipselectfield
git switch 1353-adapt-chipselectfield
git rebase master
git switch master
git merge --no-ff 1353-adapt-chipselectfield
git switch master
git merge --squash 1353-adapt-chipselectfield
git switch master
git merge --ff-only 1353-adapt-chipselectfield
git switch master
git merge 1353-adapt-chipselectfield
git push origin master
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
aleksis/AlekSIS-Core!3582
No description provided.