Skip to content
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: Delete the file and recall it with Ctrl+Z, displaying an error pop-up window in dde-file-dailog #2014

Merged
merged 1 commit into from
Jun 19, 2024

Conversation

liyigang1
Copy link
Contributor

Failure to load the trashcore plugin resulted in no trashinfo creation failure. Use dfileinfo to read data during restore

Log: Delete the file and recall it with Ctrl+Z, displaying an error pop-up window in dde-file-dailog
Bug: https://pms.uniontech.com/bug-view-254735.html

@liyigang1 liyigang1 force-pushed the fix-2 branch 4 times, most recently from a3d603d to 9f2109e Compare June 11, 2024 05:25
@@ -292,6 +286,173 @@ bool DoRestoreTrashFilesWorker::checkRestoreInfo(const QUrl &url, FileInfoPointe
return result;
}

bool DoRestoreTrashFilesWorker::doCheckRestoreFromTrashFile(const DFileInfo &fromInfo, const FileInfoPointer &toInfo, const QString &fileName, FileInfoPointer &newTargetInfo, bool *skip)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

代码冗余太多,需要合并优化,在filebasework里面有了。

…op-up window in dde-file-dailog

Failure to load the trashcore plugin resulted in no trashinfo creation failure. Use dfileinfo to read data during restore

Log: Delete the file and recall it with Ctrl+Z, displaying an error pop-up window in dde-file-dailog
Bug: https://pms.uniontech.com/bug-view-254735.html
@deepin-ci-robot
Copy link

deepin pr auto review

Fix crash in fileoperations plugin

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: liyigang1, max-lvs

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@liyigang1
Copy link
Contributor Author

/merge

@deepin-bot deepin-bot bot merged commit d58e7aa into linuxdeepin:master Jun 19, 2024
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants