Merge branch 'V20220801' into fix-2593

models/repo.go

@@ -1603,13 +1603,6 @@ func updateRepository(e Engine, repo *Repository, visibilityChanged bool) (err e
 			if err != nil {
 				return err
 			}
-			//If repo has become private, we need set dataset and dataset_file to private
-			_, err = e.Where("repo_id = ? and status <> 2", repo.ID).Cols("status").Update(&Dataset{
-				Status: 0,
-			})
-			if err != nil {
-				return err
-			}
 
 			dataset, err := GetDatasetByRepo(repo)
 			if err != nil && !IsErrNotExist(err) {
@@ -1624,6 +1617,14 @@ func updateRepository(e Engine, repo *Repository, visibilityChanged bool) (err e
 				}
 			}
 
+			//If repo has become private, we need set dataset and dataset_file to private
+			_, err = e.Where("repo_id = ? and status <> 2", repo.ID).Cols("status").Update(&Dataset{
+				Status: 0,
+			})
+			if err != nil {
+				return err
+			}
+
 		} else {
 			//If repo has become public, we need set dataset to public
 			_, err = e.Where("repo_id = ? and status <> 2", repo.ID).Cols("status").Update(&Dataset{