rbbt-rest 1.7.7 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d755541d1ba850b137c0da8d8c2352d6ff132b64
-  data.tar.gz: 1af8cbe39f044f5d2830e412918a8dd4a564a634
+  metadata.gz: 8ae96c97e05c9cfa4ee9f482ff553982d71895a9
+  data.tar.gz: d07d53dfee35929449e9e6c2818bae23fba46a0f
 SHA512:
-  metadata.gz: 5955745c6a807c17ffc35d138415ac970ed09d1be09914ef94254c40d2872bcb983e01cee992bc8da64f233db0cfb29cb10e14f07b55c3cc476e3199e995d2d8
-  data.tar.gz: d7cc16ebe89f38b8cfbd7c4e8311237124894a267534188dbd3d482f63e9a9022044390cf3ef27d02d45052ca37ea4a91e72d0e7b32b489ed5b7a8024b8573f0
+  metadata.gz: f754df3a654c5cd86198022278e4e96d5e16f730e79b80a6393c79e5fd71f5ebd41de11c1c628496f9716bdbe1fab2bee877dd2b53b03f138f6d8ad0ef21492b
+  data.tar.gz: b06e33a16fc9c443d98ae327398d4e7b5c1390d7c3cbf860a63c3503eaed3a7a8f977d7bb196a0d1eae942b3683fe466cdfabf3e7d2f60080edf60a7b0f73e0b

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

@@ -23,6 +23,8 @@ module RbbtRESTHelpers
       layout_file = (layout ? locate_template('layout') : nil)
       template_file = locate_template('error')
 
+      reset_js_css 
+
       result = render template_file, {:job => job}, layout_file
 
       content_type :html

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

@@ -10,6 +10,11 @@ module RbbtRESTHelpers
     @recorded_css_files ||= []
   end
 
+  def reset_js_css
+    @recorded_js_files = []
+    @recorded_css_files = []
+  end
+
 
   def record_js(file)
     recorded_js_files << file

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

@@ -29,7 +29,10 @@ rbbt.post = function(url, data, params){
   if (request_params.data){
     var formData = new FormData()
     forHash(request_params.data, function(key,value){
-      formData.append(key, value)
+      if (typeof value == 'object')
+        formData.append(key, JSON.stringify(value))
+      else
+        formData.append(key, value)
     })
     request_params.data = formData
   }

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

@@ -24,11 +24,19 @@ KB.list_parents = function(database, list){
  return list.get().then(function(list_info){
    var url = '/knowledge_base/user/' + database + '/collection_parents' 
 
-   collection = {}
+   //url = add_parameter(url, 'collection', JSON.stringify(collection))
+   //return m.request({url: url, method: "POST", data:{collection:collection}})
+   //url = add_parameter(url, '_format', 'tsv_json')
+   //return rbbt.post(url, {collection: collection})
+   
+   var collection = {}
    collection[list.type] = list_info.entities
-   url = add_parameter(url, 'collection', JSON.stringify(collection))
-   url = add_parameter(url, '_format', 'tsv_json')
-   return m.request({url: url, method: "POST"})
+   
+   var data = {}
+   data.collection = collection
+   data._format = 'tsv_json'
+   
+   return rbbt.post(url, data)
  })
 }
 
@@ -38,6 +46,7 @@ KB.list_children = function(database, list){
 
    var collection = {}
    collection[list.type] = list_info.entities
+
    var data = {}
    data.collection = JSON.stringify(collection)
    data._format = 'tsv_json'

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

@@ -91,7 +91,7 @@ ModalComponent = function(element){
       var header = [title, close_button];
       var close_button = rbbt.mview.ibutton({onclick: ctrl.close, class:'small close', style: 'margin-top: -4px'}, m('i.icon.close'))
       if (ctrl.vm.url){
-        var link_button = rbbt.mview.ibutton({onclick: ctrl.link, class:'small link', style: 'margin-top: -4px'}, m('a', {href: ctrl.vm.url},[ m('i.icon.arrow.right')]))
+        var link_button = rbbt.mview.ibutton({onclick: ctrl.link, class:'small link', style: 'margin-top: -4px'}, m('a', {href: ctrl.vm.url},[ m('i.icon.external')]))
         header = [title, close_button, link_button];
       }else{
         header = [title, close_button];

metadata

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