Skip to content

Commit f438b94

Browse files
Oss sync (#526)
* chore: moved k8s library to common-lib and added scripts for adding sshTunnel config to clusters (#3848) * added db scripts for cluster table * updated script * renamed script no * changed sql script * wip * updated dependency * wip * bumped common-lib-version * updated vendor * vendor files * updated sql script no. * added insecureTls connection param in kubelink requests * updated sql script no. * added argoproj assets * wip * added argoproj files * updated .gitignore * updated sql script no * updated sql script no * shifted common-lib to major version import * check for active ci_pipeline_material (#4072) --------- Co-authored-by: Ashish-devtron <[email protected]>
1 parent 8995929 commit f438b94

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

internal/sql/repository/pipelineConfig/CiPipelineRepository.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,9 @@ func (impl CiPipelineRepositoryImpl) FindById(id int) (pipeline *CiPipeline, err
295295
pipeline = &CiPipeline{Id: id}
296296
err = impl.dbConnection.Model(pipeline).
297297
Column("ci_pipeline.*", "App", "CiPipelineMaterials", "CiTemplate", "CiTemplate.DockerRegistry", "CiPipelineMaterials.GitMaterial").
298+
Relation("CiPipelineMaterials", func(q *orm.Query) (query *orm.Query, err error) {
299+
return q.Where("(ci_pipeline_material.active=true)"), nil
300+
}).
298301
Where("ci_pipeline.id= ?", id).
299302
Where("ci_pipeline.deleted =? ", false).
300303
Select()

0 commit comments

Comments
 (0)