fix

Author: 6543

routers/api/v1/repo/repo.go

@@ -856,10 +856,13 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error {
 				Config: config,
 			})
 			deleteUnitTypes = append(deleteUnitTypes, unit_model.TypeExternalWiki)
-		} else if !*opts.HasWiki && !unit_model.TypeExternalWiki.UnitGlobalDisabled() {
-			deleteUnitTypes = append(deleteUnitTypes, unit_model.TypeExternalWiki)
-		} else if !*opts.HasWiki && !unit_model.TypeWiki.UnitGlobalDisabled() {
-			deleteUnitTypes = append(deleteUnitTypes, unit_model.TypeWiki)
+		} else if !*opts.HasWiki {
+			if !unit_model.TypeExternalWiki.UnitGlobalDisabled() {
+				deleteUnitTypes = append(deleteUnitTypes, unit_model.TypeExternalWiki)
+			}
+			if !unit_model.TypeWiki.UnitGlobalDisabled() {
+				deleteUnitTypes = append(deleteUnitTypes, unit_model.TypeWiki)
+			}
 		}
 	}
 

tests/integration/api_repo_edit_test.go

@@ -53,9 +53,8 @@ func getRepoEditOptionFromRepo(repo *repo_model.Repository) *api.EditRepoOption
 		hasWiki = true
 	} else if unit, err := repo.GetUnit(db.DefaultContext, unit_model.TypeExternalWiki); err == nil {
 		hasWiki = true
-		config := unit.ExternalWikiConfig()
 		externalWiki = &api.ExternalWiki{
-			ExternalWikiURL: config.ExternalWikiURL,
+			ExternalWikiURL: unit.ExternalWikiConfig().ExternalWikiURL,
 		}
 	}
 	defaultBranch := repo.DefaultBranch