Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-26 12:15:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/goharbor/harbor into fix-resource-order

Browse Source
This commit is contained in:
wang yan 2020-08-19 15:30:48 +08:00
commit a7b9495ba0
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/api/admin_job.go
View File

@ -261,7 +261,7 @@ func (aj *AJAPI) submit(ajr *models.AdminJobReq) {
if jb.UpdateTime.Add(2 * time.Hour).After(time.Now()) {
if isOnGoing(jb.Status) {
err := errors.Errorf("reject job submitting: job %s with ID %d is %s", jb.Name, jb.ID, jb.Status)
aj.SendInternalServerError(errors.Wrap(err, "submit : AJAPI"))
aj.SendConflictError(errors.Wrap(err, "submit : AJAPI"))
return
}

7
src/portal/src/app/project/repository/artifact-list-page/artifact-list/artifact-list-tab/artifact-list-tab.component.spec.ts
View File

@ -267,6 +267,11 @@ describe("ArtifactListTabComponent (inline template)", () => {
}
};
const mockNewArtifactService = {
TriggerArtifactChan$: {
subscribe: (fn) => {
}
},
listArtifactsResponse: () => {
if (filtereName === 'sha256:3e33e3e3') {
return of(
@ -314,7 +319,7 @@ describe("ArtifactListTabComponent (inline template)", () => {
ArtifactDefaultService,
{ provide: Router, useValue: mockRouter },
{ provide: SERVICE_CONFIG, useValue: config },
{ provide: ArtifactService, useValue: mockArtifactService },
{ provide: ArtifactService, useValue: mockNewArtifactService },
{ provide: ProjectService, useClass: ProjectDefaultService },
{ provide: ScanningResultService, useClass: ScanningResultDefaultService },
{ provide: LabelService, useClass: LabelDefaultService },