Skip to content

Commit a080498

Browse files
committed
CORE-1901 Allow Agave jobs only in job listings
1 parent 6001df0 commit a080498

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/apps/persistence/jobs.clj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
[permissions-client.core :as pc]))
2424

2525
(def de-job-type "DE")
26+
(def agave-job-type "Agave")
2627
(def tapis-job-type "Tapis")
2728
(def interactive-job-type "Interactive")
2829
(def osg-job-type "OSG")

src/apps/service/apps/combined.clj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
jp/combined-client-name)
2424

2525
(getJobTypes [_]
26-
(mapcat #(.getJobTypes %) clients))
26+
(conj (mapcat #(.getJobTypes %) clients) jp/agave-job-type))
2727

2828
(listSystemIds [_]
2929
(mapcat #(.listSystemIds %) clients))
@@ -368,4 +368,5 @@
368368
(.hasAppPermission (util/get-apps-client clients system-id) username system-id app-id required-level))
369369

370370
(supportsJobSharing [_ job-step]
371-
(.supportsJobSharing (util/apps-client-for-job-step clients job-step) job-step)))
371+
(and (not= (:job_type job-step) jp/agave-job-type)
372+
(.supportsJobSharing (util/apps-client-for-job-step clients job-step) job-step))))

0 commit comments

Comments
 (0)