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 topics deleted via API not being deleted in org page #24825

Merged
merged 3 commits into from
May 21, 2023

Conversation

yardenshoham
Copy link
Member

The topics are saved in the repo_topic table with a repoID key. They are also saved directly in the repository table.

Before this PR, only AddTopic and SaveTopics made sure the topics field in the repository field was synced with the repo_topic table.

This PR makes sure GenerateTopics and DeleteTopic also sync the topics in the repository table.

RemoveTopicsFromRepo doesn't need to sync the data as it is only used to delete a repository.

The topics are saved in the repo_topic table with a repoID key. They are also saved directly in the repository table.

Before this PR, only `AddTopic` and `SaveTopics` made sure the `topics` field in the repository field was synced with the repo_topic table.

This PR makes sure `GenerateTopics` and `DeleteTopic` also sync the `topics` in the repository table.

`RemoveTopicsFromRepo` doesn't need to sync the data as it is only used to delete a repository.
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 20, 2023
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 20, 2023
@yardenshoham yardenshoham added type/bug outdated/backport/v1.19 This PR should be backported to Gitea 1.19 labels May 20, 2023
Copy link
Contributor

@wxiaoguang wxiaoguang left a comment

Choose a reason for hiding this comment

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

good catch

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 21, 2023
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 21, 2023
@yardenshoham yardenshoham added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 21, 2023
@delvh delvh merged commit edd8ea0 into go-gitea:main May 21, 2023
@GiteaBot GiteaBot added this to the 1.20.0 milestone May 21, 2023
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request May 21, 2023
)

The topics are saved in the `repo_topic` table.
They are also saved directly in the `repository` table.

Before this PR, only `AddTopic` and `SaveTopics` made sure the `topics`
field in the `repository` table was synced with the `repo_topic` table.

This PR makes sure `GenerateTopics` and `DeleteTopic`
also sync the `topics` in the repository table.

`RemoveTopicsFromRepo` doesn't need to sync the data
as it is only used to delete a repository.

Fixes go-gitea#24820
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels May 21, 2023
@yardenshoham yardenshoham deleted the issues/24820 branch May 21, 2023 10:09
lunny pushed a commit that referenced this pull request May 21, 2023
…4829)

Backport #24825 by @yardenshoham

The topics are saved in the repo_topic table with a repoID key. They are
also saved directly in the repository table.

Before this PR, only `AddTopic` and `SaveTopics` made sure the `topics`
field in the repository field was synced with the repo_topic table.

This PR makes sure `GenerateTopics` and `DeleteTopic` also sync the
`topics` in the repository table.

`RemoveTopicsFromRepo` doesn't need to sync the data as it is only used
to delete a repository.

- Fixes #24820
silverwind added a commit to bl00mber/gitea that referenced this pull request May 21, 2023
* main: (90 commits)
  Refactor rename user and rename organization (go-gitea#24052)
  Use `CommentList` instead of `[]*Comment` (go-gitea#24828)
  Fix topics deleted via API not being deleted in org page (go-gitea#24825)
  Return `404` in the API if the requested webhooks were not found (go-gitea#24823)
  Decouple the different contexts from each other (go-gitea#24786)
  [skip ci] Updated translations via Crowdin
  Add RTL rendering support to Markdown (go-gitea#24816)
  [skip ci] Updated translations via Crowdin
  Update JS dependencies (go-gitea#24815)
  Fix duplicate tooltip hiding (go-gitea#24814)
  Mute repo names in dashboard repo list (go-gitea#24811)
  Rework label colors (go-gitea#24790)
  Fix max width and margin of comment box on conversation page (go-gitea#24809)
  Allow all URL schemes in Markdown links by default (go-gitea#24805)
  Some refactors for issues stats (go-gitea#24793)
  Implement actions artifacts (go-gitea#22738)
  Fix Actions being enabled accidentally (go-gitea#24802)
  Change `add_on` in `keys_ssh.tmpl` (go-gitea#24803)
  replace `drone exec` to `act_runner exec` in test README.md (go-gitea#24791)
  Fix OAuth loading state (go-gitea#24788)
  ...
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 22, 2023
* giteaofficial/main: (27 commits)
  Fix regression: access log template, gitea manager cli command (go-gitea#24838)
  Merge message template support for rebase without merge commit (go-gitea#22669)
  [skip ci] Updated licenses and gitignores
  Support wildcard in email domain allow/block list (go-gitea#24831)
  Change `--font-weight-bold` to `--font-weight-semibold` and 600 value, introduce new font weight variables (go-gitea#24827)
  Rewrite logger system (go-gitea#24726)
  Support Copy Link for video attachments (go-gitea#24833)
  Fix video width overflow in markdown, and other changes to match img (go-gitea#24834)
  Improve accessibility when (re-)viewing files (go-gitea#24817)
  Refactor rename user and rename organization (go-gitea#24052)
  Use `CommentList` instead of `[]*Comment` (go-gitea#24828)
  Fix topics deleted via API not being deleted in org page (go-gitea#24825)
  Return `404` in the API if the requested webhooks were not found (go-gitea#24823)
  Decouple the different contexts from each other (go-gitea#24786)
  [skip ci] Updated translations via Crowdin
  Add RTL rendering support to Markdown (go-gitea#24816)
  [skip ci] Updated translations via Crowdin
  Update JS dependencies (go-gitea#24815)
  Fix duplicate tooltip hiding (go-gitea#24814)
  Mute repo names in dashboard repo list (go-gitea#24811)
  ...
Codeberg-org pushed a commit to Codeberg-org/gitea that referenced this pull request Jun 3, 2023
) (go-gitea#24829)

Backport go-gitea#24825 by @yardenshoham

The topics are saved in the repo_topic table with a repoID key. They are
also saved directly in the repository table.

Before this PR, only `AddTopic` and `SaveTopics` made sure the `topics`
field in the repository field was synced with the repo_topic table.

This PR makes sure `GenerateTopics` and `DeleteTopic` also sync the
`topics` in the repository table.

`RemoveTopicsFromRepo` doesn't need to sync the data as it is only used
to delete a repository.

- Fixes go-gitea#24820

(cherry picked from commit 04f9ab1)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 19, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug] WebUI: Topics get removed from org repo, but not from organization view
5 participants