Fix rename notification bug (#18011)
This commit is contained in:
		
							parent
							
								
									2051f850ef
								
							
						
					
					
						commit
						a15f0cb010
					
				
					 2 changed files with 4 additions and 2 deletions
				
			
		|  | @ -148,8 +148,6 @@ func (a *actionNotifier) NotifyNewPullRequest(pull *models.PullRequest, mentions | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| func (a *actionNotifier) NotifyRenameRepository(doer *models.User, repo *models.Repository, oldRepoName string) { | func (a *actionNotifier) NotifyRenameRepository(doer *models.User, repo *models.Repository, oldRepoName string) { | ||||||
| 	log.Trace("action.ChangeRepositoryName: %s/%s", doer.Name, repo.Name) |  | ||||||
| 
 |  | ||||||
| 	if err := models.NotifyWatchers(&models.Action{ | 	if err := models.NotifyWatchers(&models.Action{ | ||||||
| 		ActUserID: doer.ID, | 		ActUserID: doer.ID, | ||||||
| 		ActUser:   doer, | 		ActUser:   doer, | ||||||
|  |  | ||||||
|  | @ -8,6 +8,7 @@ import ( | ||||||
| 	"fmt" | 	"fmt" | ||||||
| 
 | 
 | ||||||
| 	"code.gitea.io/gitea/models" | 	"code.gitea.io/gitea/models" | ||||||
|  | 	"code.gitea.io/gitea/modules/log" | ||||||
| 	"code.gitea.io/gitea/modules/notification" | 	"code.gitea.io/gitea/modules/notification" | ||||||
| 	"code.gitea.io/gitea/modules/sync" | 	"code.gitea.io/gitea/modules/sync" | ||||||
| ) | ) | ||||||
|  | @ -53,6 +54,8 @@ func TransferOwnership(doer, newOwner *models.User, repo *models.Repository, tea | ||||||
| 
 | 
 | ||||||
| // ChangeRepositoryName changes all corresponding setting from old repository name to new one.
 | // ChangeRepositoryName changes all corresponding setting from old repository name to new one.
 | ||||||
| func ChangeRepositoryName(doer *models.User, repo *models.Repository, newRepoName string) error { | func ChangeRepositoryName(doer *models.User, repo *models.Repository, newRepoName string) error { | ||||||
|  | 	log.Trace("ChangeRepositoryName: %s/%s -> %s", doer.Name, repo.Name, newRepoName) | ||||||
|  | 
 | ||||||
| 	oldRepoName := repo.Name | 	oldRepoName := repo.Name | ||||||
| 
 | 
 | ||||||
| 	// Change repository directory name. We must lock the local copy of the
 | 	// Change repository directory name. We must lock the local copy of the
 | ||||||
|  | @ -66,6 +69,7 @@ func ChangeRepositoryName(doer *models.User, repo *models.Repository, newRepoNam | ||||||
| 	} | 	} | ||||||
| 	repoWorkingPool.CheckOut(fmt.Sprint(repo.ID)) | 	repoWorkingPool.CheckOut(fmt.Sprint(repo.ID)) | ||||||
| 
 | 
 | ||||||
|  | 	repo.Name = newRepoName | ||||||
| 	notification.NotifyRenameRepository(doer, repo, oldRepoName) | 	notification.NotifyRenameRepository(doer, repo, oldRepoName) | ||||||
| 
 | 
 | ||||||
| 	return nil | 	return nil | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue