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.

Sign up for GitHub

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

Jump to bottom

fix: display issue of naming conflicts in shared folders #2038

Merged
merged 1 commit into from
Jun 25, 2024
Merged

fix: display issue of naming conflicts in shared folders #2038

merged 1 commit into from
Jun 25, 2024

Conversation

yang233000
Copy link
Contributor

Log: Restore the file state to the previous state when a naming conflict user cancels the operation

Bug: https://pms.uniontech.com/bug-view-259627.html

@deepin-ci-robot
Copy link

Hi @yang233000. Thanks for your PR. 😃

@deepin-ci-robot
Copy link

Hi @yang233000. Thanks for your PR.

I'm waiting for a linuxdeepin member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@yang233000 yang233000 force-pushed the master branch 4 times, most recently from cbf5fae to 1160f6e Compare June 24, 2024 13:29
itsXuSt
itsXuSt suggested changes Jun 25, 2024
View reviewed changes
Copy link
Contributor

@itsXuSt itsXuSt left a comment

Choose a reason for hiding this comment

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

注意代码规范。

src/plugins/common/dfmplugin-dirshare/widget/sharecontrolwidget.cpp Outdated Show resolved Hide resolved
@itsXuSt
Copy link
Contributor

itsXuSt commented Jun 25, 2024

/checks

@yang233000
fix: display issue of naming conflicts in shared folders
05a1d85 
Unable to display file sharing status properly during naming conflicts

Log: Restore the file state to the previous state when a naming conflict user cancels the operation

Bug: https://pms.uniontech.com/bug-view-259627.html
@yang233000 yang233000 closed this Jun 25, 2024
@yang233000 yang233000 reopened this Jun 25, 2024
@yang233000 yang233000 closed this Jun 25, 2024
@yang233000 yang233000 reopened this Jun 25, 2024
@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

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

@max-lvs max-lvs merged commit b0efe6c into linuxdeepin:master Jun 25, 2024
44 of 48 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@max-lvs max-lvs max-lvs approved these changes

@itsXuSt itsXuSt itsXuSt approved these changes

Assignees
No one assigned
Labels
needs-ok-to-test
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@yang233000 @deepin-ci-robot @itsXuSt @max-lvs