@@ -48,10 +48,18 @@ func getDeploymentReleaseTargets(c *gin.Context, ws *workspace.Workspace, deploy
4848 return releaseTargets , nil
4949}
5050
51- func getReleaseTargetJobs (ws * workspace.Workspace , releaseTarget * oapi.ReleaseTarget ) ([]* oapi.Job , error ) {
51+ func getReleaseTargetJobs (ws * workspace.Workspace , releaseTarget * oapi.ReleaseTarget , versionId string ) ([]* oapi.Job , error ) {
5252 jobsMap := ws .Jobs ().GetJobsForReleaseTarget (releaseTarget )
5353 jobs := make ([]* oapi.Job , 0 )
5454 for _ , job := range jobsMap {
55+ release , ok := ws .Releases ().Get (job .ReleaseId )
56+ if ! ok {
57+ continue
58+ }
59+
60+ if release .Version .Id != versionId {
61+ continue
62+ }
5563 jobs = append (jobs , job )
5664 }
5765
@@ -74,8 +82,8 @@ type environmentWithTargets struct {
7482 ReleaseTargets []* fullReleaseTarget `json:"releaseTargets"`
7583}
7684
77- func getFullReleaseTarget (ws * workspace.Workspace , releaseTarget * oapi.ReleaseTarget ) (* fullReleaseTarget , error ) {
78- jobs , err := getReleaseTargetJobs (ws , releaseTarget )
85+ func getFullReleaseTarget (ws * workspace.Workspace , releaseTarget * oapi.ReleaseTarget , versionId string ) (* fullReleaseTarget , error ) {
86+ jobs , err := getReleaseTargetJobs (ws , releaseTarget , versionId )
7987 if err != nil {
8088 return nil , err
8189 }
@@ -130,7 +138,7 @@ func (s *DeploymentVersions) GetDeploymentVersionJobsList(c *gin.Context, worksp
130138 environmentReleaseTargets := getEnvironmentReleaseTargets (releaseTargets , environment .Id )
131139 fullReleaseTargets := make ([]* fullReleaseTarget , 0 )
132140 for _ , releaseTarget := range environmentReleaseTargets {
133- fullReleaseTarget , err := getFullReleaseTarget (ws , releaseTarget )
141+ fullReleaseTarget , err := getFullReleaseTarget (ws , releaseTarget , versionId )
134142 if err != nil {
135143 c .JSON (http .StatusInternalServerError , gin.H {
136144 "error" : err .Error (),
0 commit comments