cck_forms 3.4.4 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f23c7296f8d99270dad64a2eb63d68753190a098
-  data.tar.gz: 405d3a8da75336283392c732012e65da4269bc08
+SHA256:
+  metadata.gz: e5b1694eaef5aa6125133841efdedd5310233d322c178cf5cfa1da1e836f8b1e
+  data.tar.gz: 5b45670f29322fb3fbf11faa71cd958b09fc8dfff6e6d0abe345f9c85fbd9b0d
 SHA512:
-  metadata.gz: 6d44d8edb906d9e20d6839c1b4881d52f9f0f8363718093b6bf063c2eb26eb39d91391a97316ffd4bc66f171b01f4cf93dda175b2e44919c577577e7b7dea47a
-  data.tar.gz: 56722f8414d55ae7d9c8de68c648a4fccfafec876ffa824b4899632ca4c2f0f668539451fd20dc98fc302f7fff710ed8251ba1d57d39fe311c7c6815219bff43
+  metadata.gz: 7c65ff5c37bc0960d9cb2c9f5bb0100e1bd41f4740370fb104a5da81d2e1c2c2bee634fa277fc615f8117f10bfb8c1277931e7ba711a7dc7d68b46390e1d06ed
+  data.tar.gz: b53e4c077aeb1c28e29a08660da5bd3d1e2f62a6f14105358b9d088518082659a8cf746426c08de27f81421bf45c301225b9e75d852fd58c851103522fda0926

data/lib/cck_forms/parameter_type_class/float.rb

@@ -14,6 +14,32 @@ class CckForms::ParameterTypeClass::Float
     trailing_zeros && value.to_i == value ? value.to_i  : value
   end
 
+  # '123'     -> 123
+  # '100/'    -> $gte: 100
+  # '100/150' -> $gte: 100, $lte: 150
+  #    '/150' ->            $lte: 150
+  #
+  # l: 100          -> $gte: 100
+  # l: 100, h: 150  -> $gte: 100, $lte: 150
+  #         h: 150  ->            $lte: 150
+  def search(selectable, field, query)
+    if query.is_a?(Hash) || query.to_s.include?('/')
+      low, high = query.is_a?(Hash) ? [query[:l] || query['l'], query[:h] || query['h']] : query.to_s.split('/')
+
+      if low.to_f > 0
+        selectable = selectable.gte(field => low.to_f)
+      end
+
+      if high.to_f > 0
+        selectable = selectable.lte(field => high.to_f)
+      end
+
+      selectable
+    else
+      selectable.where(field => query.to_f)
+    end
+  end
+
   # HTML input
   def build_form(form_builder, options)
     set_value_in_hash options

data/lib/cck_forms/parameter_type_class/map.rb

@@ -11,6 +11,7 @@ class CckForms::ParameterTypeClass::Map
   @@map_providers = [MAP_TYPE_YANDEX, MAP_TYPE_GOOGLE]
 
   mattr_accessor :google_maps_api_key
+  mattr_accessor :yandex_maps_api_key
 
   # In MongoDB: {latlon: [x, y], zoom: z}
   #
@@ -197,7 +198,8 @@ class CckForms::ParameterTypeClass::Map
       map_html_containers.push %Q|<div id="#{id}_#{map}" data-id=#{id} class="map_widget" style="display: none; width: #{options[:width]}px; height: #{options[:height]}px"></div>|
     end
 
-    api_key = @@google_maps_api_key.present? ? "&key=#{@@google_maps_api_key}" : nil
+    google_api_key = @@google_maps_api_key.present? ? "&key=#{@@google_maps_api_key}" : nil
+    yandex_api_key = @@yandex_maps_api_key.present? ? "&apikey=#{@@yandex_maps_api_key}" : nil
 
     %Q|
     <div class="map-canvas">
@@ -218,12 +220,12 @@ class CckForms::ParameterTypeClass::Map
         var script;
         script = document.createElement('script');
         script.type = 'text/javascript';
-        script.src = 'https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&callback=googleMapReady#{api_key}';
+        script.src = 'https://maps.googleapis.com/maps/api/js?v=3.exp&sensor=false&callback=googleMapReady#{google_api_key}';
         document.body.appendChild(script);
 
         script = document.createElement('script');
         script.type = 'text/javascript';
-        script.src = 'https://api-maps.yandex.ru/2.0/?coordorder=longlat&load=package.full&wizard=constructor&lang=ru-RU&onload=yandexMapReady';
+        script.src = 'https://api-maps.yandex.ru/2.0/?coordorder=longlat&load=package.full&wizard=constructor&lang=ru-RU&onload=yandexMapReady#{yandex_api_key}';
         document.body.appendChild(script);
       }
 

data/lib/cck_forms/parameter_type_class/work_hours.rb

@@ -218,7 +218,7 @@ class CckForms::ParameterTypeClass::WorkHours
 
       if template
         header = ['<ul class="nav nav-pills">']
-        CckForms::ParameterTypeClass::WorkHours::DAYS.each { |day| header << '<li><a href="javascript:void(0)"><input name="' + form_builder.object_name + '[days]" type="checkbox" value="' + day + '" /> ' + CckForms::ParameterTypeClass::WorkHours.day_to_short(day) + '</a></li>' }
+        CckForms::ParameterTypeClass::WorkHours::DAYS.each { |day| header << '<li class="nav-item"><a class="nav-link" href="javascript:void(0)"><input name="' + form_builder.object_name + '[days]" type="checkbox" value="' + day + '" /> ' + CckForms::ParameterTypeClass::WorkHours.day_to_short(day) + '</a></li>' }
         header = header.push('</ul>').join
       else
         header = sprintf '<strong>%s</strong>:%s', CckForms::ParameterTypeClass::WorkHours::day_to_short(day), form_builder.hidden_field(:day)

data/lib/cck_forms/version.rb

@@ -1,3 +1,3 @@
 module CckForms
-  VERSION = '3.4.4'
+  VERSION = '3.5.1'
 end

data/vendor/assets/javascripts/cck_forms/jquery.workhours.js

@@ -241,7 +241,7 @@ $(function() {
 
             // mark checkboxes
             for(var i = 0, ic = days.length; i < ic; ++ i) {
-                $newGroup.find("input[name$=\"[days]\"][value=" + days[i] + "]").prop("checked", true).closest("li").addClass("active");
+                $newGroup.find("input[name$=\"[days]\"][value=" + days[i] + "]").prop("checked", true).closest(".nav-link").addClass("active");
             }
 
             // hide checkboxes, link-o-buttons will be in their place
@@ -289,7 +289,7 @@ $(function() {
                     this._days[dayName].workhoursday("value", $group.workhoursday("value"));
 
                     // mark the day as active
-                    input.parentNode.parentNode.className += " active";
+                    input.parentNode.className += " active";
 
                 } else {
 
@@ -300,7 +300,7 @@ $(function() {
                     if($group.find("input:checked[name$='[days]']").size() == 0) {
                         $group.remove();
                     } else {
-                        input.parentNode.parentNode.className = input.parentNode.parentNode.className.replace(/(^|\s)active($|\s)/, "$1");
+                        input.parentNode.className = input.parentNode.className.replace(/(^|\s)active($|\s)/, "$1");
                     }
                 }
 

data/vendor/assets/javascripts/cck_forms/map.js.coffee

@@ -35,12 +35,12 @@ class CckFormsMap.AbstractMap
     @internalMapAPI.setZoom zoom
   setMarkerToPoint: (latitudeAndLongitude) ->
 
-  setCenterByGeocode: (geocode) ->
+  setCenterByGeocode: (geocode, apikey) ->
 
     options = {
       url:      'https://geocode-maps.yandex.ru/1.x/'
       dataType: 'json'
-      data:     {format: 'json', geocode: geocode, results: 1}
+      data:     {format: 'json', geocode: geocode, results: 1, apikey: apikey}
     }
 
     xhr = $.ajax options

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cck_forms
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.5.1
 platform: ruby
 authors:
 - Ilya Konanykhin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-08 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -101,7 +101,7 @@ homepage: http://github.com/ilya-konanykhin/cck_forms
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -116,9 +116,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Content Construction Kit Forms
 test_files: []