-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
Add drag & drop untracked cross-db move #10564
Open
vuurvli3g
wants to merge
16
commits into
keepassxreboot:develop
Choose a base branch
from
vuurvli3g:feature/dragdrop-untracked-move
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add drag & drop untracked cross-db move #10564
vuurvli3g
wants to merge
16
commits into
keepassxreboot:develop
from
vuurvli3g:feature/dragdrop-untracked-move
+619
−79
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
… parent Partially fixes keepassxreboot#8170 (for inter-db moves)
- Preserve the LastModificationTime for a group/entry cloned with the CloneResetTimeInfo flag - Retain UUID's and timeInfo when moving group(s)/entry(s) between db's - Prevent the Recycle Bin group from being moved to another db - Cross-db moves that might require merge logic are not (yet) supported and show an error message instead Fixes keepassxreboot#6202 Fixes keepassxreboot#8170
…ationTime Cases: - Entry is added to a Group - Entry is removed from a Group - The Group list is sorted
- The user is presented with an in error message if it is the case. - The recycler is prevented from being moved away.
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.
The current drag & drop cross-database move implementation is designed for the use-case where 2 or more systems have the same databases in continuous (direct) sync with each other.
A serious disadvantage of the implementation is that the item directly loses the ability to merge with other versions of the item.
This PR adds an alternative "untracked" move implementation.
The exact item is moved to the target database as if it had always been created there and never existed in the source database.
Ideal for use-cases that do not use the database in direct-sync or for users that needs to retain the item's ability to merge with other versions.
If the database is used in a direct-sync setup, the user would have to temporary disable the sync, maintain the database, manually distribute the new database to the other systems, and resume the sync. Otherwise the item would reappear shortly after being moved.
An "untracked" cross-db move is done by holding a keyboard's Alt key while dragging & dropping an item in an other database.
Testing strategy
Manual testing by dragging different entries & groups between different databases.
Type of change
Remarks
This PR is based of changes made in PR: #10481
Actual changes of this PR (Relative to the other) start at 86c6f68