rbbt-rest 1.8.151 → 1.8.154

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd9278f880225799697df0bc7599a97d5463942604f3c6947e65c5450495e2ad
-  data.tar.gz: 3441f94e0dc3cbced78e4572d4d743d047d0be1dcd0728c5ebbf8c7bb0b8d74c
+  metadata.gz: a5d66dadd84c4328c97bc395bf66c183478988e8e3e11f31ab359d82563e2ad9
+  data.tar.gz: 4ee1e9191aeaa79db99622fc93853e29cac176ce77882e85eff6e5e80f2611b6
 SHA512:
-  metadata.gz: d8f1453f376b923caf6b7868462f877246614b9f051da579b55429d21ad2f2ad66ce7ad6bf99ee83dcfb20160611b983e7a6e02c477ba4501b4e0e5c112ec3b4
-  data.tar.gz: ac6c5d333a5f6b5cd41c78c014b8166d4c9f38b88297b40e89b66243bcadea5ba2896d639e5efb792b84e6562931af22498c384d14b938c36c878ad50d750f3a
+  metadata.gz: 526d6a192bfc4a2784c76b67778aec3fd88dca7bbb5a493769fd8d350b5eccd2bb4c5d18b22893fcad8c1b1a2a7e0bbb141fdd0c4d40bed90d482c16038eb853
+  data.tar.gz: dfe8034d8a8f773212573729f888ada533444039404711479fb2e53b80b1077c8e35955f7d95ef5340c04b521ff5d0af82111c7238ad0428cdbcaaac79980a1c

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

@@ -280,6 +280,7 @@ module RbbtRESTHelpers
   end
 
   def add_GET_param(url, param, value)
+    url = remove_GET_param(url, param)
     if url =~ /\?.+=/
       url + "&#{ param }=#{ value }"
     else

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

@@ -317,7 +317,7 @@ module RbbtRESTHelpers
 
     entity_options = options[:entity_options]
 
-    Misc.prepare_entity(value, type, entity_options) if Entity.formats[type] and not options[:unnamed]
+    value = Misc.prepare_entity(value, type, entity_options) if Entity.formats[type] and not options[:unnamed]
 
     orig_value = value
     value = value.link if value.respond_to? :link and not options[:unnamed]
@@ -339,7 +339,9 @@ module RbbtRESTHelpers
           when true, "true", :true
             Array === value ? value.collect{|v| "<span class='table_value'>#{v.to_s}</span>"} * ", " : "<span class='table_value'>#{value}</span>"
           when :long, "long"
-            Array === value ? value.zip(orig_value).collect{|v,ov| "<span class='table_value long' title='#{URI.escape(ov.to_s)}'>#{v.to_s}</span>"} * " " : "<span class='table_value long' title='#{URI.escape(orig_value)}'>#{value}</span>"
+            Array === value ? value.zip(orig_value).collect{|v,ov| "<span class='table_value long' title='#{CGI.escape(ov.to_s)}'>#{v.to_s}</span>"} * " " : "<span class='table_value long' title='#{CGI.escape(orig_value)}'>#{value}</span>"
+          when :lines, "lines"
+            Array === value ? value.zip(orig_value).collect{|v,ov| "<span class='table_value long lines' title='#{CGI.escape(ov.to_s)}'>#{v.to_s}<br/></span>"} * " " : "<span class='table_value long lines' title='#{CGI.escape(orig_value)}'>#{value}</span>"
           else
             Array === value ? value.collect{|v| v.to_s} * ", " : value
           end

data/lib/rbbt/rest/entity/rest.rb

@@ -3,7 +3,6 @@ require 'rbbt/rest/entity/list'
 
 module Entity
   module REST
-    USE_ENSEMBL = true
 
     REST_ENTITIES = Set.new
 
@@ -177,7 +176,6 @@ module Entity
     end
 
     def list_link(text = nil, id = nil, options = {})
-      options = Misc.add_defaults options, :ensembl => USE_ENSEMBL
       ensembl = Misc.process_options options, :ensembl
 
       if ensembl and self.respond_to? :ensembl and self.format !~ /^Ensembl /

data/share/views/compass/misc.sass

@@ -258,6 +258,8 @@ label[title]
 td
   &.true
     font-weight: bold
+span[title=true]
+  font-weight: bold
 
 span.choice
   padding: 0.5em

data/share/views/partials/dependencies.haml

@@ -15,7 +15,7 @@
       - dep_status = "done" if dep.path.exists?
 
     - dep_status ||= dep.status
-    - if ! remote && dep.file(:progress).exists?
+    - if ! remote && ! dep_status == 'done' && dep.file(:progress).exists?
       - pgr = dep.file(:progress).yaml
       - if pgr and pgr[:last_percent]
         - start = pgr[:start]
@@ -63,7 +63,7 @@
         - elsif Module === dep_workflow
           - wf = dep_workflow
 
-        - if Open.remote?(dep.path)
+        - if remote
           - url = dep.path.split("?").first
           %a(href=url) #{ name }  
 

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

@@ -29,7 +29,12 @@ function contract_ellipsis(elem, max){
       var links = [];
       var head = elements.slice(0, max).removeClass('long');
       head.each(function(){ links.push(this.outerHTML)})
-      new_content = links.join(", ");
+
+      if (elements.first().hasClass('lines'))
+        new_content = links.join(" ");
+      else
+        new_content = links.join(", ");
+
       elem.html(new_content);
     }
 
@@ -45,9 +50,22 @@ function restore_ellipsis(elem){
   var span = elem.find('span.ellipsis')
   if (span.length == 1){
     var html = span.attr('attr-text');
+
+    var by_lines = span.parent().find('span').first().hasClass('lines')
+
+    if (by_lines){
+      var other_tds = span.parent().parent().find('td')
+    }
+
     elem.html(unescape(html));
+
+    if (by_lines){
+      other_tds.each(function(i,x){restore_ellipsis($(x))})
+    }
+
+
+    update_rbbt();
   }
-  update_rbbt();
 }
 
 $('body').on('click', 'a.open_ellipsis', function(link){

data/share/views/public/plugins/cytoscapejs/cytoscape.js

@@ -1 +1 @@
-share/views/public/plugins/cytoscapejs/cytoscape.umd.js
+./cytoscape.umd.js

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.151
+  version: 1.8.154
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2022-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake