rbbt-rest 1.8.88 → 1.8.89

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 358d549496ba4e8b3e9119f2fdb8d3252c6fedfe
4
- data.tar.gz: a432f23d2fefedd6e7f5c6a9c9e3fa402c5723b2
3
+ metadata.gz: 5820902c44bac061c51f34df2b5a55d39f0efebf
4
+ data.tar.gz: 661ea3f59f39899f6a947eec590c63bde4a39a0e
5
5
  SHA512:
6
- metadata.gz: 6b68578b34573c0ad0a06acb4d8e203dc5cdaef4a08535aea75bd36ccac8f76783256bf4e6484f21427008b4aac921046af186d149ecc0e731f59c3899e04ac0
7
- data.tar.gz: 1bc07223825607e4a4249941e35ca2df36e6e16a59b1b793370f618e5190bbd72795e628930d2293d2658482c0c99e67d69beecc7c8b198d7200ca30909bc3f3
6
+ metadata.gz: 10e76e4069872cd0a17df81ced102b335efa294e0f3f16d293bef4b89613bb056b9b5be08a39c080ffae86884bc4e126d7c0fbb62356391dba9036a8cd3a16bd
7
+ data.tar.gz: ebd8ee95d45ac227308c8ef806374da53ac3b537c6a64f528612a822ab70ffbc39a54acb21fc72aa6ea8acfec0fdc463a47d7f533a36dc396b84ee39a54f2720
@@ -75,6 +75,10 @@ module RbbtRESTHelpers
75
75
  Tilt::HamlTemplate.new(layout_file, :filename => layout_file).render(self, locals) do
76
76
  Log.debug{ "Rendering #{template_file} with layout #{Misc.fingerprint cache_options}" }
77
77
  cache(cache, locals.merge(:_template_file => template_file, :user => user).merge(cache_options)) do
78
+ if locals[:result].nil? && Step === locals[:job]
79
+ res = locals[:job].load
80
+ locals[:result] = res
81
+ end
78
82
  if Open.exists?(documentation_file)
79
83
  documentation_layout_file = locate_template('documented_section').find
80
84
  markdown = Open.read(documentation_file)
@@ -112,12 +112,11 @@ module WorkflowRESTHelpers
112
112
  end
113
113
 
114
114
  def show_result(job, workflow, task, params = nil)
115
- #return show_result_html nil, workflow, task, job.name, job if @fragment
116
115
  return show_result_html nil, workflow, task, job.name, job, params if @fragment
117
116
 
118
117
  case format.to_sym
119
118
  when :html
120
- show_result_html job.load, workflow, task, job.name, job, params
119
+ show_result_html nil, workflow, task, job.name, job, params
121
120
  when :table
122
121
  halt 200, tsv2html(job.path, :url => "/" << [workflow.to_s, task, job.name] * "/")
123
122
  when :entities
@@ -102,6 +102,7 @@ function replace_object(object, href, embedd, complete){
102
102
 
103
103
  object.addClass("embedded").attr('target-href', href)
104
104
 
105
+ href = rbbt.url_add_script_name(href)
105
106
  $.ajax({
106
107
  url : href,
107
108
  cache: false,
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rbbt-rest
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.8.88
4
+ version: 1.8.89
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-01-15 00:00:00.000000000 Z
11
+ date: 2018-01-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake