mirror of
				https://codeberg.org/forgejo/forgejo.git
				synced 2025-10-31 14:31:02 +00:00 
			
		
		
		
	[MODERATION] organization blocking a user (#802)
- Resolves #476 - Follow up for: #540 - Ensure that the doer and blocked person cannot follow each other. - Ensure that the block person cannot watch doer's repositories. - Add unblock button to the blocked user list. - Add blocked since information to the blocked user list. - Add extra testing to moderation code. - Blocked user will unwatch doer's owned repository upon blocking. - Add flash messages to let the user know the block/unblock action was successful. - Add "You haven't blocked any users" message. - Add organization blocking a user. Co-authored-by: Gusted <postmaster@gusted.xyz> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/802 (cherry picked from commit0505a10421) (cherry picked from commit37b4e6ef9b) (cherry picked from commitc17c121f2c) [MODERATION] organization blocking a user (#802) (squash) Changes to adapt to:6bbccdd177Improve AJAX link and modal confirm dialog (#25210) Refs: https://codeberg.org/forgejo/forgejo/pulls/882/files#issuecomment-945962 Refs: https://codeberg.org/forgejo/forgejo/pulls/882#issue-330561 (cherry picked from commit523635f83c) (cherry picked from commit4743eaa6a0)
This commit is contained in:
		
					parent
					
						
							
								7009b9fe87
							
						
					
				
			
			
				commit
				
					
						eff5b43d2e
					
				
			
		
					 26 changed files with 371 additions and 16 deletions
				
			
		|  | @ -155,3 +155,16 @@ func TestWatchRepoMode(t *testing.T) { | |||
| 	assert.NoError(t, repo_model.WatchRepoMode(12, 1, repo_model.WatchModeNone)) | ||||
| 	unittest.AssertCount(t, &repo_model.Watch{UserID: 12, RepoID: 1}, 0) | ||||
| } | ||||
| 
 | ||||
| func TestUnwatchRepos(t *testing.T) { | ||||
| 	assert.NoError(t, unittest.PrepareTestDatabase()) | ||||
| 
 | ||||
| 	unittest.AssertExistsAndLoadBean(t, &repo_model.Watch{UserID: 4, RepoID: 1}) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &repo_model.Watch{UserID: 4, RepoID: 2}) | ||||
| 
 | ||||
| 	err := repo_model.UnwatchRepos(db.DefaultContext, 4, []int64{1, 2}) | ||||
| 	assert.NoError(t, err) | ||||
| 
 | ||||
| 	unittest.AssertNotExistsBean(t, &repo_model.Watch{UserID: 4, RepoID: 1}) | ||||
| 	unittest.AssertNotExistsBean(t, &repo_model.Watch{UserID: 4, RepoID: 2}) | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue