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

CATROID-1493 Fix Look gets deleted in all projects #4637

Merged
merged 1 commit into from
Oct 25, 2022
Merged

CATROID-1493 Fix Look gets deleted in all projects #4637

merged 1 commit into from
Oct 25, 2022

Conversation

mseiser
Copy link
Contributor

@mseiser mseiser commented Oct 8, 2022 •
edited
Loading

Fixes bug that deletes file when deleting imported object.
File also got deleted for original sprite.
https://jira.catrob.at/browse/CATROID-1493

Your checklist for this pull request

Please review the contributing guidelines and wiki pages of this repository.

  • Include the name of the Jira ticket in the PR’s title
  • Include a summary of the changes plus the relevant context
  • Choose the proper base branch (develop)
  • Confirm that the changes follow the project’s coding guidelines
  • Verify that the changes generate no compiler or linter warnings
  • Perform a self-review of the changes
  • Verify to commit no other files than the intentionally changed ones
  • Include reasonable and readable tests verifying the added or changed behavior
  • Confirm that new and existing unit tests pass locally
  • Check that the commits’ message style matches the project’s guideline
  • Stick to the project’s gitflow workflow
  • Verify that your changes do not have any conflicts with the base branch
  • After the PR, verify that all CI checks have passed
  • Post a message in the catroid-stage or catroid-ide Slack channel and ask for a code reviewer

@mseiser mseiser force-pushed the CATROID-1493 branch 8 times, most recently from 2582c5e to 8a7a8c3 Compare October 11, 2022 18:24
l-ilma
l-ilma requested changes Oct 15, 2022
View reviewed changes
Copy link
Contributor

@l-ilma l-ilma left a comment

Choose a reason for hiding this comment

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

I've checked your changes, in general everything is fine except a few smaller points 👍

catroid/src/main/java/org/catrobat/catroid/content/Sprite.java Show resolved Hide resolved
catroid/src/main/java/org/catrobat/catroid/content/Sprite.java Show resolved Hide resolved
.../java/org/catrobat/catroid/test/content/sprite/ImportObjectIntoProjectFromContextMenuTest.kt Show resolved Hide resolved
l-ilma
l-ilma approved these changes Oct 17, 2022
View reviewed changes
Copy link
Contributor

@l-ilma l-ilma left a comment

Choose a reason for hiding this comment

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

Looks good 👍

@mseiser
CATROID-1493 Fix unwanted delete of original
4097ccf 
Fixes bug that deletes file when deleting imported object
Walcho1125
Walcho1125 approved these changes Oct 25, 2022
View reviewed changes
Copy link
Contributor

@Walcho1125 Walcho1125 left a comment

Choose a reason for hiding this comment

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

Thank you!

@Walcho1125 Walcho1125 merged commit 75198cb into Catrobat:develop Oct 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@l-ilma l-ilma l-ilma approved these changes

@Walcho1125 Walcho1125 Walcho1125 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mseiser @Walcho1125 @l-ilma