rbbt-rest 1.2.19 → 1.2.20

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDg4YjY0Mjk2NDU0OTJiZWE1NGNkY2Y4ZWEwZjdiZTk1M2RlNTQ3Mg==
+    ZWQwMzQxOGYyM2FlNDNkNDVhMTAxZWVhMWNmNWZhZWU1OWJhOGQ4ZQ==
   data.tar.gz: !binary |-
-    YTIzNzAyZjQyMTEzOTZmMDU3OTkwNmNhZWFjN2E0YTFmZjZjMjhkZA==
+    YzAyNTQwOTZlODQyZjZkNmRiZWRlMzE3OTBlYzNhZTM3MDZmMWNlZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjkzZDVjMWViOTRiYzc1ZGJmNTk2ODU0NDIxYmFjMzk3MjhmODc3YTJmOGZh
-    MjA0NGRiODUyNDFlYTRkNTg1NmUwZmRjZjIzYmI2NjE4MTcwMzc4N2VhOTA1
-    MmJkMWI5NWQ4ODM3MzI1MjRjNDA0M2YyZjQxMjgzOWI3NGQ4NTg=
+    ZTQ0NDcwMzZmZmU1MTU3YzRjMmEzY2I1MjAzNTRjYTBhZmY5Mzg3YmJlZWU2
+    YWM5MTk3NjZkYTY3NDQ4MmE0M2YyZTM2M2EyMTE4MjhlMTI5ODU3ODRmZTNk
+    NGM1MTFkOTE4ZGI4NGFlOTUzNWUxZmQ5N2Y4YTI4OWEyZTNlOTU=
   data.tar.gz: !binary |-
-    YWVjZDRhYzIzY2ViMTc5OTFjZWViNjJiM2E2ZDRjOWM2MGRmYjgyMTNkYjk0
-    MGY3NGY0OWYwNzI5NTU1NGZiOGM0ZjQxYTY2OTFhYTA4NWY2MzQxY2MwYWYy
-    MTQxMjY0YTFlOWU2OGIxMmQyMzVhOTJmNDljYzAxMmI2OTczMmI=
+    MWZmMzE4M2I2ZWFmZTAxZjFjMzRkMjFjNWQ3YjM1ZmYwNTNhNzU3OTIwOWI2
+    NzY1OWU3M2RjOWU0OWM4MGQ4MWU2MmE3YmRhYWZmMDI2MDFjZTUyZTk1NWM2
+    NDJkNzVjYWZkNGFhNmUxMGE4NzhiMzI3OTU4NTBmN2NjNTI3MmE=

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

@@ -24,6 +24,8 @@ module RbbtRESTHelpers
   def form_input(name, type, default = nil, current = nil, description = nil, id = nil, extra = {})
     html_options = consume_parameter(:html_options, extra) || {}
 
+    no_file = extra[:no_file] if extra
+
     case type
     when :multiple
       choices = consume_parameter(:choices, extra)
@@ -47,10 +49,6 @@ module RbbtRESTHelpers
               true_id = nil
             end
 
-              #choice_html = html_tag("input", nil, :type => :hidden, :name => choice_name + "_checkbox_false", :value => "false") +
-              #  html_tag("input", nil, :type => :checkbox, :checked => check_true, :name => choice_name, :value => "true", :id => choice_id) +
-              #  input_label(choice_id, choice, nil, nil, extra.merge({:class => :inline})) 
-            
               choice_html = html_tag("input", nil, :type => :checkbox, :checked => check_true, :name => choice_name, :value => "true", :id => choice_id) +
                 input_label(choice_id, choice, choice, nil, extra.merge({:class => :inline})) 
 
@@ -98,17 +96,20 @@ module RbbtRESTHelpers
       value = current.nil? ? default : current
       value = value * "\n" if Array === value
 
-      input_label(id, name, description, default, extra) +
-      file_or_text_area(id, name, value)
+      if no_file
+        input_label(id, name, description, default, extra) +
+          html_tag("textarea", value || "" , :name => name, :id => id )
+      else
+        input_label(id, name, description, default, extra) +
+          file_or_text_area(id, name, value)
+      end
 
     when :select
       value = current.nil? ? default : current
 
-
       allow_empty = consume_parameter :allow_empty, extra
       select_options = consume_parameter :select_options, extra
       
-
       if select_options 
         options = select_options.collect do |option|
           option, option_name = option if Array === option

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

@@ -118,10 +118,11 @@ $.widget("rbbt.table", {
    return false
   })
 
-  table.on('click', 'tfoot > tr > th > ul.table_pagination > li.arrow > a.next', function(link){
-   var stat = tool._status()
+  table.on('click', 'tfoot > tr > th > ul.table_pagination > li.arrow > a.next', function(evt){
+   var stat = tool._status();
+   var last = parseInt($(this).parents('ul.table_pagination').first().find('li.num').last().find('a').html())
 
-   if (stat.num < stat.total + 1){ stat.num = stat.num + 1 }
+   if (stat.num < last){ stat.num = stat.num + 1 }
 
    tool._update(stat.url, stat.num, stat.size, stat.field, stat.filter)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.2.19
+  version: 1.2.20
 platform: ruby
 authors:
 - Miguel Vazquez