projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '3859-api-job-lock-method' refs #3859
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
jobs_controller.rb
diff --git
a/apps/workbench/app/controllers/jobs_controller.rb
b/apps/workbench/app/controllers/jobs_controller.rb
index dc31229189e9a7be5636eb38ec58f9aa510aec0e..40f4378544cb7c38ee659a3055874bed8f9cb533 100644
(file)
--- a/
apps/workbench/app/controllers/jobs_controller.rb
+++ b/
apps/workbench/app/controllers/jobs_controller.rb
@@
-27,15
+27,20
@@
class JobsController < ApplicationController
if params[:uuid]
@objects = Job.where(uuid: params[:uuid])
generate_provenance(@objects)
if params[:uuid]
@objects = Job.where(uuid: params[:uuid])
generate_provenance(@objects)
+ render_index
else
@limit = 20
else
@limit = 20
+ super
end
end
- super
end
def cancel
@object.cancel
end
def cancel
@object.cancel
- redirect_to @object
+ if params[:return_to]
+ redirect_to params[:return_to]
+ else
+ redirect_to @object
+ end
end
def show
end
def show
@@
-52,6
+57,6
@@
class JobsController < ApplicationController
end
def show_pane_list
end
def show_pane_list
- %w(Status
Attributes Provenance Metadata JSON API
)
+ %w(Status
Log Details Provenance Advanced
)
end
end
end
end