Fix small issues around delete/undo #5296
Conversation
juliushaertl
commented
Nov 17, 2023
•
juliushaertl
commented
- fix: Only query boards not marked for deletion unless we want to undo
- fix: Show proper error page when board was not found
- fix: Properly undo card deletion in the frontend
juliushaertl
changed the title
juliushaertl
force-pushed
the
bugfix/noid/deleted-board-frontend
branch
from
ba42da7
to
6c18f50
Compare
src/components/board/Board.vue
Outdated
| @@ -24,12 +24,19 @@ | |||
| <div class="board-wrapper"> | |||
| <Controls :board="board" /> | |||
|
|
|||
| {{ loading }} | |||
lib/Service/CardService.php
Outdated
| if ($card->getDeletedAt() !== 0) { | ||
| if ($deletedAt === null) { | ||
| // Only allow operations when restoring the card | ||
| throw new StatusException('Operation not allowed.'); |
There was a problem hiding this comment.
This would be better: Operation not allowed. This card was deleted.
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
juliushaertl
force-pushed
the
bugfix/noid/deleted-board-frontend
branch
from
6c18f50
to
3c047d3
Compare
|
/backport to stable27 |
|
/backport to stable26 |
|
/backport to stable27 |
|
/backport to stable26 |
|
The backport to stable27 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable27
git pull origin stable27
# Create the new backport branch
git checkout -b fix/foo-stable27
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27Error: Unknown error More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
The backport to stable26 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable26
git pull origin stable26
# Create the new backport branch
git checkout -b fix/foo-stable26
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26Error: Unknown error More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
/backport a05d642 to stable26 |
|
/backport a05d642 to stable25 |
|
/backport a05d642 to stable24 |
|
The backport to stable25 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable25
git pull origin stable25
# Create the new backport branch
git checkout -b fix/foo-stable25
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25Error: Unknown error More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
/backport a05d642 to stable23 |
|
The backport to stable24 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable24
git pull origin stable24
# Create the new backport branch
git checkout -b fix/foo-stable24
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable24Error: Unknown error More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
The backport to stable23 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable23
git pull origin stable23
# Create the new backport branch
git checkout -b fix/foo-stable23
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable23Error: Unknown error More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
