active_scaffold 3.6.3 → 3.6.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a5f95a3c7624f3802f29e275341ce3184e9979d91644b48395126b4009fd103e
4
- data.tar.gz: af61fae0cf8128ec58d90f4e40b6cbdb95400d5491e790a638bafb1dd8bb4909
3
+ metadata.gz: 9669748f60be5817e4e654db635763351b986b914e85aff89d5b04b3f6ffe848
4
+ data.tar.gz: 55a24b6c7ef8e4ac5e517db0d559fbdba43ba055c6eaaa5a5c70e73baa935841
5
5
  SHA512:
6
- metadata.gz: 35795f0bf6eb16148401b4df273c93a02064a3c25d100e58aa17c9de97f48629be77ad4043e30e73e25e208f49318a4ffe877f1d0a2ffee61147fa2cfe8dcc0d
7
- data.tar.gz: 8be4d03e807f6a621b7812854d062d472d51047399e435303be25ce85522a29486b8d4d48acf6b7d2e72f22def1960c8801e6409bc45651483d15ff2ec9c9a94
6
+ metadata.gz: 16dddca354bfaf6dcaa405f4dacb89c402563d06df115dc74ffba41d39e9ff8dadebaf4ec9b63a2a2830f1887ad43f640bd0873fede81c392c96fa5e06b128ac
7
+ data.tar.gz: 0cc2b4014d79082b8d1f704913f1d22c4876072e3608ffef0dd27f38d237021ee607b280142ee0d5c4402020b3a9533eda56f19d6a0788d5ae27c18cc16ea073
data/CHANGELOG.rdoc CHANGED
@@ -1,3 +1,12 @@
1
+ = 3.6.5
2
+ - Support timezone in jquery timepicker
3
+
4
+ = 3.6.4.1
5
+ - Actually fix country_select bridge for latest gem version
6
+
7
+ = 3.6.4
8
+ - Fix country_select bridge for latest gem version
9
+
1
10
  = 3.6.3
2
11
  - Fix search on nested or embedded lists with rails_ujs
3
12
  - Fix inplace edit when collection action link opens a view with table and th
@@ -42,7 +51,7 @@
42
51
  - Display loading indicator at bottom on auto pagination
43
52
  - List rendering speed up
44
53
  - Remove font family from CSS, it was preventing from changing it easily in body
45
- - Fix search for mongoid models in with threadsafety enabled
54
+ - Fix search for mongoid models with threadsafety enabled
46
55
  - Keep nested params after calling render_field for column in subform
47
56
  - Fix nested for controllers without list action (for example, for nested create on singular assocations)
48
57
  - Fix delayed setup issues with threads
@@ -41,6 +41,7 @@ de:
41
41
  closeText: Schließen
42
42
  currentText: Jetzt
43
43
  timeText: Uhrzeit
44
+ timezoneText: Timezone
44
45
  days: Tage
45
46
  delete: Löschen
46
47
  deleted_model: "%{model} gelöscht"
@@ -41,6 +41,7 @@ en:
41
41
  closeText: Close
42
42
  currentText: Now
43
43
  timeText: Hour
44
+ timezoneText: Timezone
44
45
  days: Days
45
46
  delete: Delete
46
47
  deleted_model: Deleted %{model}
@@ -41,6 +41,7 @@ es:
41
41
  closeText: Cerrar
42
42
  currentText: Ahora
43
43
  timeText: Hora
44
+ timezoneText: Zona horaria
44
45
  days: Días
45
46
  delete: Borrar
46
47
  deleted_model: "%{model} borrado"
@@ -41,6 +41,7 @@ fr:
41
41
  closeText: Fermer
42
42
  currentText: Maintenant
43
43
  timeText: Heure
44
+ timezoneText: Timezone
44
45
  days: Jours
45
46
  delete: Supprimer
46
47
  deleted_model: Suppression de %{model}
@@ -40,7 +40,8 @@ hu:
40
40
  datetime_picker_options:
41
41
  closeText:
42
42
  currentText:
43
- timeText:
43
+ timeText:
44
+ timezoneText: Timezone
44
45
  days: Days
45
46
  delete: Törlés
46
47
  deleted_model: "%{model} törölve"
@@ -40,7 +40,8 @@ ja:
40
40
  datetime_picker_options:
41
41
  closeText:
42
42
  currentText:
43
- timeText:
43
+ timeText:
44
+ timezoneText: Timezone
44
45
  days: Days
45
46
  delete: 削除
46
47
  deleted_model: "%{model}を削除しました"
@@ -40,7 +40,8 @@ ru:
40
40
  datetime_picker_options:
41
41
  closeText: Закрыть
42
42
  currentText: Текущее время
43
- timeText:
43
+ timeText:
44
+ timezoneText: Timezone
44
45
  days: дней
45
46
  delete: Удалить
46
47
  deleted_model: "%{model}: запись удалена"
@@ -2,7 +2,8 @@ module ActiveScaffold::Bridges
2
2
  class CountrySelect
3
3
  module FormColumnHelpers
4
4
  def active_scaffold_input_country(column, options)
5
- select_options = {:prompt => as_(:_select_), :priority_countries => column.options[:priority] || [:us], :format => column.options[:format]}
5
+ select_options = {:prompt => as_(:_select_), :priority_countries => column.options[:priority] || [:us]}
6
+ select_options[:format] = column.options[:format] if column.options[:format]
6
7
  select_options.merge!(options)
7
8
  options.reverse_merge!(column.options).except!(:prompt, :priority, :format)
8
9
  active_scaffold_select_name_with_multiple options
@@ -18,7 +18,8 @@ module ActiveScaffold::Bridges
18
18
  /%M/ => 'mm',
19
19
  /%p/ => 'tt',
20
20
  /%S/ => 'ss',
21
- /%[cUWwxXZz]/ => ''
21
+ /%z/ => 'Z',
22
+ /%[cUWwxXZ]/ => ''
22
23
  }.freeze
23
24
 
24
25
  def self.date_options_for_locales
@@ -82,13 +83,14 @@ module ActiveScaffold::Bridges
82
83
 
83
84
  def self.to_datepicker_format(rails_format)
84
85
  return nil if rails_format.nil?
85
- if rails_format =~ /%[cUWwxXZz]/
86
+ unsupported = DATE_FORMAT_CONVERSION.index ''
87
+ if rails_format =~ unsupported
88
+ options = unsupported.to_s.scan(/\[(.*)\]/).dig(0, 0)&.each_char&.map { |c| "%#{c}" }
86
89
  Rails.logger.warn(
87
90
  "AS DatePicker::Helper: rails date format #{rails_format} includes options "\
88
91
  "which can't be converted to jquery datepicker format. "\
89
- 'Options %c, %U, %W, %w, %x %X, %z, %Z are not supported by datepicker and will be removed'
92
+ "Options #{options.join(', ')} are not supported by datepicker and will be removed"
90
93
  )
91
- nil
92
94
  end
93
95
  js_format = rails_format.dup
94
96
  js_format.gsub!(/([ ]|^)([^% ]\S*)/, " '\\2'")
@@ -2,7 +2,7 @@ module ActiveScaffold
2
2
  module Version
3
3
  MAJOR = 3
4
4
  MINOR = 6
5
- PATCH = 3
5
+ PATCH = 5
6
6
 
7
7
  STRING = [MAJOR, MINOR, PATCH].compact.join('.')
8
8
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: active_scaffold
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.6.3
4
+ version: 3.6.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Many, see README
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-11-24 00:00:00.000000000 Z
11
+ date: 2022-03-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -475,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
475
475
  - !ruby/object:Gem::Version
476
476
  version: '0'
477
477
  requirements: []
478
- rubygems_version: 3.0.9
478
+ rubygems_version: 3.3.7
479
479
  signing_key:
480
480
  specification_version: 4
481
481
  summary: Rails 4.x and 5.x versions of ActiveScaffold supporting prototype and jquery