WIP: Draft: Resolve "Error if creating a new school term without a start and end date" #3032

added 1 commit <ul><li>6b170aa2 - Allow extra rules for date and time fields</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1387/diffs?diff_id=39506&start_sha=2ead9fc3fc8ffcbc3f0c68578341ac95b44ba49e)

pinguin commented

2024-02-21 20:23:13 +01:00

Author

Contributor

marked this merge request as ready

marked this merge request as **ready**

pinguin commented

2024-02-21 20:23:46 +01:00

Author

Contributor

Hangzhi and I now fixed it in the Dev-Meeting 👍

Hangzhi and I now fixed it in the Dev-Meeting :thumbsup:

leuckeju commented

2024-02-23 15:45:20 +01:00

Member

the changes you did in the vue-components are fixed already (done in #973) I believe this MR was to fix the backend (or has this been addressed already due to the new frontend?)

leuckeju commented

2024-02-23 15:45:28 +01:00

Member

marked this merge request as draft

marked this merge request as **draft**

yuha commented

2024-05-29 20:46:58 +02:00

Member

assigned to @yuha and unassigned @pinguin

yuha commented

2024-05-29 20:47:21 +02:00

Member

@yuha checks if there is something that needs to be done backend-wise

yuha commented

2024-08-21 20:48:48 +02:00

Member

@yuha still needs to do that

This pull request has changes conflicting with the target branch.

aleksis/core/frontend/components/generic/forms/DateField.vue
aleksis/core/frontend/components/generic/forms/TimeField.vue

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'WIP: Draft: Resolve "Error if creating a new school term without a start and end date"' (#3032) from 781-error-if-creating-a-new-school-term-without-a-start-and-end-date into master

Merge commit body

Reviewed-on: https://code.teckids.org/aleksis/AlekSIS-Core/pulls/3032

Merge pull request 'WIP: Draft: Resolve "Error if creating a new school term without a start and end date"' (#3032) from 781-error-if-creating-a-new-school-term-without-a-start-and-end-date into master

Reviewed-on: https://code.teckids.org/aleksis/AlekSIS-Core/pulls/3032

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin 781-error-if-creating-a-new-school-term-without-a-start-and-end-date:781-error-if-creating-a-new-school-term-without-a-start-and-end-date

git switch 781-error-if-creating-a-new-school-term-without-a-start-and-end-date

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 781-error-if-creating-a-new-school-term-without-a-start-and-end-date

git switch 781-error-if-creating-a-new-school-term-without-a-start-and-end-date

git rebase master

git switch master

git merge --ff-only 781-error-if-creating-a-new-school-term-without-a-start-and-end-date

git switch 781-error-if-creating-a-new-school-term-without-a-start-and-end-date

git rebase master

git switch master

git merge --no-ff 781-error-if-creating-a-new-school-term-without-a-start-and-end-date

git switch master

git merge --squash 781-error-if-creating-a-new-school-term-without-a-start-and-end-date