projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Increase limit for collections controller querying same portable_data_hash as
[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 841d3a9fdc6827486a7f54948e6c63ee4b3b5b1a..40f4378544cb7c38ee659a3055874bed8f9cb533 100644
(file)
--- a/
apps/workbench/app/controllers/jobs_controller.rb
+++ b/
apps/workbench/app/controllers/jobs_controller.rb
@@
-1,6
+1,8
@@
class JobsController < ApplicationController
def generate_provenance(jobs)
class JobsController < ApplicationController
def generate_provenance(jobs)
+ return if params['tab_pane'] != "Provenance"
+
nodes = []
collections = []
jobs.each do |j|
nodes = []
collections = []
jobs.each do |j|
@@
-25,6
+27,7
@@
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
super
else
@limit = 20
super
@@
-33,11
+36,16
@@
class JobsController < ApplicationController
def cancel
@object.cancel
def cancel
@object.cancel
- redirect_to @object
+ if params[:return_to]
+ redirect_to params[:return_to]
+ else
+ redirect_to @object
+ end
end
def show
generate_provenance([@object])
end
def show
generate_provenance([@object])
+ super
end
def index_pane_list
end
def index_pane_list
@@
-49,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