rbbt-rest 1.8.88 → 1.8.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 358d549496ba4e8b3e9119f2fdb8d3252c6fedfe
-  data.tar.gz: a432f23d2fefedd6e7f5c6a9c9e3fa402c5723b2
+  metadata.gz: 5820902c44bac061c51f34df2b5a55d39f0efebf
+  data.tar.gz: 661ea3f59f39899f6a947eec590c63bde4a39a0e
 SHA512:
-  metadata.gz: 6b68578b34573c0ad0a06acb4d8e203dc5cdaef4a08535aea75bd36ccac8f76783256bf4e6484f21427008b4aac921046af186d149ecc0e731f59c3899e04ac0
-  data.tar.gz: 1bc07223825607e4a4249941e35ca2df36e6e16a59b1b793370f618e5190bbd72795e628930d2293d2658482c0c99e67d69beecc7c8b198d7200ca30909bc3f3
+  metadata.gz: 10e76e4069872cd0a17df81ced102b335efa294e0f3f16d293bef4b89613bb056b9b5be08a39c080ffae86884bc4e126d7c0fbb62356391dba9036a8cd3a16bd
+  data.tar.gz: ebd8ee95d45ac227308c8ef806374da53ac3b537c6a64f528612a822ab70ffbc39a54acb21fc72aa6ea8acfec0fdc463a47d7f533a36dc396b84ee39a54f2720

data/lib/rbbt/rest/common/render.rb

@@ -75,6 +75,10 @@ module RbbtRESTHelpers
       Tilt::HamlTemplate.new(layout_file, :filename => layout_file).render(self, locals) do
         Log.debug{ "Rendering #{template_file} with layout #{Misc.fingerprint cache_options}" }
         cache(cache, locals.merge(:_template_file => template_file, :user => user).merge(cache_options)) do
+          if locals[:result].nil? && Step === locals[:job]
+            res = locals[:job].load 
+            locals[:result] = res
+          end
           if Open.exists?(documentation_file)
             documentation_layout_file = locate_template('documented_section').find
             markdown = Open.read(documentation_file)

data/lib/rbbt/rest/workflow/jobs.rb

@@ -112,12 +112,11 @@ module WorkflowRESTHelpers
   end
 
   def show_result(job, workflow, task, params = nil)
-    #return show_result_html nil, workflow, task, job.name, job if @fragment
     return show_result_html nil, workflow, task, job.name, job, params if @fragment
 
     case format.to_sym
     when :html
-      show_result_html job.load, workflow, task, job.name, job, params
+      show_result_html nil, workflow, task, job.name, job, params
     when :table
       halt 200, tsv2html(job.path, :url => "/" << [workflow.to_s, task, job.name] * "/")
     when :entities

data/share/views/public/js/helpers/_ajax_replace.js

@@ -102,6 +102,7 @@ function replace_object(object, href, embedd, complete){
 
   object.addClass("embedded").attr('target-href', href)
 
+  href = rbbt.url_add_script_name(href)
   $.ajax({
     url : href,
     cache: false,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.88
+  version: 1.8.89
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake