diff --git a/models/repo/repo_list.go b/models/repo/repo_list.go index c265ca8a3c..a27afcc1d8 100644 --- a/models/repo/repo_list.go +++ b/models/repo/repo_list.go @@ -508,9 +508,9 @@ func SearchRepositoryCondition(opts *SearchRepoOptions) builder.Cond { door43metadata.GetOwnerCond(opts.Owners, false), door43metadata.GetSubjectCond(opts.Subjects, false), door43metadata.GetResourceCond(opts.Resources), - door43metadata.GetContentFormatCond(opts.ContentFormats, true), + door43metadata.GetContentFormatCond(opts.ContentFormats, false), door43metadata.GetBookCond(opts.Books), - door43metadata.GetLanguageCond(opts.Languages, true), + door43metadata.GetLanguageCond(opts.Languages, false), door43metadata.GetMetadataTypeCond(opts.MetadataTypes, false), door43metadata.GetMetadataVersionCond(opts.MetadataVersions, false)) /*** EMD DCS Customizations ***/ diff --git a/services/convert/repository.go b/services/convert/repository.go index e4e038ec2b..a16562ac48 100644 --- a/services/convert/repository.go +++ b/services/convert/repository.go @@ -161,7 +161,7 @@ func innerToRepo(ctx context.Context, repo *repo_model.Repository, permissionInR repoAPIURL := repo.APIURL() - return ToRepoDCS(ctx, repo, isParent, &api.Repository{ + return ToRepoDCS(ctx, repo, &api.Repository{ ID: repo.ID, Owner: ToUserWithAccessMode(ctx, repo.Owner, permissionInRepo.AccessMode), Name: repo.Name, diff --git a/services/convert/repository_dcs.go b/services/convert/repository_dcs.go index 4ae0b89019..b6ef7c4899 100644 --- a/services/convert/repository_dcs.go +++ b/services/convert/repository_dcs.go @@ -11,13 +11,11 @@ import ( ) // ToRepoDCS adds Door43 metadata properties to the API Repo object -func ToRepoDCS(ctx context.Context, repo *repo_model.Repository, isParent bool, apiRepo *api.Repository) *api.Repository { +func ToRepoDCS(ctx context.Context, repo *repo_model.Repository, apiRepo *api.Repository) *api.Repository { if err := repo.LoadLatestDMs(ctx); err != nil { return apiRepo } - dm := repo.RepoDM - apiRepo.Title = dm.Title apiRepo.Subject = dm.Subject apiRepo.Language = dm.Language @@ -28,14 +26,10 @@ func ToRepoDCS(ctx context.Context, repo *repo_model.Repository, isParent bool, apiRepo.MetadataType = dm.MetadataType apiRepo.MetadataVersion = dm.MetadataVersion apiRepo.Ingredients = dm.Ingredients - - if isParent { - apiRepo.CatalogStages = &api.CatalogStages{ - Production: ToCatalogStage(ctx, repo.LatestProdDM), - PreProduction: ToCatalogStage(ctx, repo.LatestPreprodDM), - Latest: ToCatalogStage(ctx, repo.DefaultBranchDM), - } + apiRepo.CatalogStages = &api.CatalogStages{ + Production: ToCatalogStage(ctx, repo.LatestProdDM), + PreProduction: ToCatalogStage(ctx, repo.LatestPreprodDM), + Latest: ToCatalogStage(ctx, repo.DefaultBranchDM), } - return apiRepo }