rbbt-rest 1.6.18 → 1.6.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50a80b1e900811f9313d5332a663615caaba19c0
-  data.tar.gz: 3ae859db445a0771e27a41c55bcdcc505067d7e1
+  metadata.gz: 7d08766d3d4b92f104d088d234b6e14b3520dd03
+  data.tar.gz: 3423b44e0e90dbab4c4b08123b29572197694a45
 SHA512:
-  metadata.gz: 6bc0372e6194dd4124c54a4fadb7d77c87920516224246921fc6e9c8d33064f8e3ac6ddf253f5d338fad08890121b9d689384e4ebfc88826bb44db5361a0aa85
-  data.tar.gz: 61df35849b043ec3be66024499a6b7668f1b67810eab1c9fdd34fb70a32b5adbdca7930643de904e97e3b055d5ebf891964cad210a88297c8d78c7d15562d161
+  metadata.gz: eafefedf6cfaced11c2d9de90f12d85d49a0135317d19374883b544adb8249bb82e19dfb661062ef06113f90e50928fb811b00d81d01cb782bc4819cdf4c165a
+  data.tar.gz: db75b68e8318690ac638c0f58f16ae690f10bb5504e0750db667591f4051314ffec3b8a45725da5f24948c33aae09d9169d2a3dc23c9494753be4a5f6f8ebf68

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

@@ -40,9 +40,10 @@ module WorkflowRESTHelpers
 
   def execution_type(workflow, task)
     export = type_of_export(workflow, task)
-    return :sync if export == :exec and format == :html
-    return export if export == :exec or cache_type.nil?
     return cache_type if cache_type
+    return :sync if export == :exec and format == :html
+    return export if export == :exec 
+    return :sync
   end
   
   def prepare_job_inputs(workflow, task, params)
@@ -51,13 +52,6 @@ module WorkflowRESTHelpers
 
     task_inputs = {}
     inputs.each do |input|
-      #value = consume_parameter(input, params)
-      #param_file = consume_parameter(input.to_s + '__param_file', params)
-      #next if value.nil? and param_file.nil?
-      #type = input_types[input]
-
-      #fixed_value = fix_input(type, value, param_file)
-      #task_inputs[input] = fixed_value
       task_inputs[input] = prepare_input(params, input, input_types[input])
     end
 

data/share/views/compass/app.sass

@@ -16,6 +16,7 @@ body
 #content
   padding: 64px 16px 0 32px
   width: 100%
+  margin-bottom: 2em
 
 #top_menu
   z-index: 100
@@ -361,3 +362,7 @@ label[title]
 
 body
   overflow: auto
+
+.preload
+  #footer
+    display: none

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

@@ -143,8 +143,10 @@ function forHash(obj, fn, thisObj){
     return fn.call(thisObj, key, obj[key], obj);
   }
   for (key in obj) {
-    if (exec(fn, obj, key, thisObj) === false) {
-      break;
+    if (obj.hasOwnProperty(key)) { 
+      if (exec(fn, obj, key, thisObj) === false) {
+        break;
+      }
     }
   }
   return forHash;

data/share/views/public/js/rbbt.exception.js

@@ -5,6 +5,7 @@ rbbt.exception.null = function(variable, text){
 }
 
 rbbt.exception.report = function(err){
+  console.log("Error: " + err)
   rbbt.modal.controller().error(err, "Application Error")
 }
 
@@ -19,3 +20,7 @@ rbbt.try = function(func){
   return f
 }
 
+rbbt.do_try = function(func){
+  rbbt.try(func)()
+}
+

data/share/views/public/js/rbbt.job.js

@@ -9,6 +9,38 @@ rbbt.Job = function(workflow, task, inputs){
   this.result = m.prop()
   this.info = m.prop()
 
+  this.exec = function(json){
+    var deferred = m.deferred()
+    
+    var url = '/' + workflow + '/' + task
+
+    var data = new FormData()
+    data.append("_cache_type", 'exec')
+
+    if (json)
+      data.append("_format", 'json')
+    else
+      data.append("_format", 'raw')
+
+    for (i in inputs){
+      data.append(i, inputs[i])
+    }
+
+    var params = {
+      url: url, 
+      method: 'POST', 
+      serialize: function(data) {return data},
+      data: data,
+      deserialize: function(value) {return value},
+    }
+
+    if (json)
+      params.deserialize = function(data){return JSON.parse(data)}
+
+
+    return rbbt.insist_request(params, deferred).then(this.result)
+  }.bind(this)
+  
   this.issue = function(){
     var deferred = m.deferred()
     
@@ -21,6 +53,7 @@ rbbt.Job = function(workflow, task, inputs){
 
     var data = new FormData()
     data.append("_format", 'jobname')
+    data.append("_cache_type", 'async')
     for (i in inputs){
       data.append(i, inputs[i])
     }

data/share/views/public/js/rbbt.modal.js

@@ -4,6 +4,7 @@ rbbt.modal.element = document.getElementById('modal')
 rbbt.modal.vm = (function(){
   var vm = {}
   vm.init = function(){
+    console.log(m)
     vm.visible = m.prop(false)
     vm.content = m.prop("")
     vm.title = m.prop("")

data/share/views/public/js/rbbt/table.js

@@ -59,7 +59,6 @@ $.widget("rbbt.table", {
     $.scrollTo(table.find('tfoot'), {axis : 'y', offset: {top: - window.innerHeight + 100 }});
    }else{ complete() }
    if (tool.options.ellipsis !== undefined && ! $(table).hasClass('no_js')){
-     console.log($(table).hasClass('no_js'))
     tool._fix_long_table_cells(5);
    }
   });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.6.18
+  version: 1.6.19
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake