-
Notifications
You must be signed in to change notification settings - Fork 8
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
fix(admin/revision): duplicate ouuid put back deleted revision #955
Merged
Davidmattei
merged 8 commits into
ems-project:5.x
from
Davidmattei:fix/core-duplicate-ouuid
Jul 12, 2024
Merged
fix(admin/revision): duplicate ouuid put back deleted revision #955
Davidmattei
merged 8 commits into
ems-project:5.x
from
Davidmattei:fix/core-duplicate-ouuid
Jul 12, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- newDocument is called on api update - createData is called from ui
Also it only makes sense to lock the draft revision. The other revisions will also be put back, but locking is not needed.
Will check the currentRevision and restore if needed. The restored draft will be closed (endTime) and draft discard.
Because if we work with a single ouuid, the putBack method will return the current revision as a new draft.
theus77
approved these changes
Jul 12, 2024
@@ -45,20 +45,20 @@ public function createAction(?string $ouuid, string $name, Request $request): Re | |||
$this->dataService->refresh($newRevision->giveContentType()->giveEnvironment()); | |||
} | |||
} catch (\Exception $e) { | |||
if (($e instanceof NotFoundHttpException) or ($e instanceof BadRequestHttpException)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
WTF "or". Good catch
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have more :) but will not do in this PR
Davidmattei
changed the title
fix(core/revision): duplicate ouuid put back deleted revision
fix(admin/revision): duplicate ouuid put back deleted revision
Jul 28, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Situation:
In both cases we should throw the DuplicatedOuuidException, but only if the revision is not deleted.
If the revision is deleted we put it back. see #891