rbbt-rest 1.8.110 → 1.8.111

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
  SHA256:
3
- metadata.gz: 91dabb0e7c2783cd5310ca9bd33f219adcc6d96a3c1f0e2ea44498c5dacea2cb
4
- data.tar.gz: 1f606d9064ea8dc300e832cd9d6faee1a6e2b39f1934c5717ce429db72ddeed9
3
+ metadata.gz: 1b5d5797f660c4a82b6fe6b1aef303fc71e807eb93a8a0d6f62fee1c5cd102e1
4
+ data.tar.gz: 3b3f83f0a1001b9bf56f9e0e50dae66f88a8da021e7712a322234bbbd139a6b6
5
5
  SHA512:
6
- metadata.gz: fe24e1fccf5409c720177b8949cccc1a06b01b421c8120027fe1ac38e00f094e45ad9b23110e7408e5e9c836ca2d4c34d9890b403043acaa9be8cd79974321f0
7
- data.tar.gz: 55614d86ed2b659d3ac41a03cf3d8eee3edccd4b8281a29724608613e6a8527e579a2d7a5404c20d125a73a33465374596ee2f7a100089263c8de5d1875b3b3a
6
+ metadata.gz: c5e717a2503add3456ade5965c38492e30ff88deb353ab3a27d639e99d60db15663451841021d4604b95d6ebe63bd6cd6200b38f71980614e0f9fbc8f490cc98
7
+ data.tar.gz: 1ebbe908667859d2e3860647db39ba19224c846f984c09dfd742e6b3e638ddf48f237776142d18ec5d8c97f57ee374375ab46afba93eae9c43c3270add2ae3f1
@@ -177,6 +177,7 @@ module RbbtRESTHelpers
177
177
  when "excel"
178
178
  require 'rbbt/tsv/excel'
179
179
  tsv, tsv_options = load_tsv(fragment_file)
180
+ tsv = tsv_process(tsv)
180
181
  content_type "text/html"
181
182
  data = nil
182
183
  excel_file = TmpFile.tmp_file
@@ -464,9 +464,12 @@ module RbbtRESTHelpers
464
464
  table_options[:heatmap] = (tsv.cast && %w(to_i to_f).include?(tsv.cast.to_s) && tsv.fields.length > 1) unless table_options.include? :heatmap
465
465
 
466
466
  table_options = default_table_options.merge(table_options)
467
+ table_options[:page] = @page if @page
468
+ table_options[:filter] = @filter if @filter
469
+ table_options[:column] = @column if @column
467
470
 
468
471
  content_type "text/html"
469
- rows, length = tsv_rows(tsv, @page || table_options[:page], @filter || table_options[:filter], @column || table_options[:column])
472
+ rows, length = tsv_rows(tsv, table_options[:page], table_options[:filter], table_options[:column])
470
473
 
471
474
  partial_render('partials/table', {:total_size => length, :rows => rows, :header => tsv.all_fields, :table_options => table_options})
472
475
  end
@@ -9,7 +9,7 @@
9
9
  - row_ids = :consume if row_ids and row_ids.to_s == "false"
10
10
  - table_url = table_options[:url] unless defined? table_url and table_url
11
11
  - total_size = table_options[:total_size] unless defined? total_size and total_size
12
- - filters = table_options[:filters] unless defined? filters and filters
12
+ - filter = table_options[:filter] unless defined? filter and filter
13
13
  - span = table_options[:span] unless defined? span and not span.nil?
14
14
  - heatmap = table_options[:heatmap] unless defined? heatmap and not heatmap.nil?
15
15
 
@@ -77,8 +77,8 @@
77
77
 
78
78
  = partial_render('partials/table/column', :table_url => table_url, :header => header, :entity_headers => entity_headers)
79
79
 
80
- = partial_render('partials/table/files', :table_url => table_url, :heatmap => heatmap)
81
-
80
+ = partial_render('partials/table/files', :table_url => table_url, :heatmap => heatmap, :filter => filter)
81
+
82
82
 
83
83
 
84
84
 
@@ -1,3 +1,4 @@
1
+ - table_url = add_GET_param(table_url, "_filter", CGI.escape(filter))
1
2
  .tsv.ui.wrap.compact.button
2
3
  %a(href="#{add_GET_param(table_url, "_format", "tsv")}") tsv
3
4
  .excel.ui.wrap.compact.button
@@ -9,7 +9,9 @@
9
9
 
10
10
  %a.ui.compact.arrow.button.next(href="#") »
11
11
 
12
- %a.ui.compact.all.button.all(href="#") all
12
+ .ui.compact.all.left.labeled.button.labeled_all
13
+ %a.ui.basic.right.pointing.label(href="#")= total_size
14
+ %a.ui.compact.button.all(href="#") all
13
15
 
14
16
  - if num - 2 > 1
15
17
  %a.ui.compact.num.button(href="#") 1
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.110
4
+ version: 1.8.111
5
5
  platform: ruby
6
6
  authors:
7
7
  - Miguel Vazquez
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-07-19 00:00:00.000000000 Z
11
+ date: 2019-08-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake