motor-admin 0.2.35 → 0.2.39

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: 1a7e4ffe16cfe1afe744f8a5c54f39858516b40d7389a0d074e7c19705181bbe
4
- data.tar.gz: 4a7b8d35fc0e1f983d4420dd995d886204ada78404fa16874907c734a3d52976
3
+ metadata.gz: 7e3ce846e29191c7486d32cd8fb4e06596d73e11d46e8d34d93094c6407c9efa
4
+ data.tar.gz: 6b875912c05b215c6a7407b64658d51ed2d035925a4816ef8d5c50e3cbe59a59
5
5
  SHA512:
6
- metadata.gz: 97583ffa5b4ea71e4ebc1802de3dbc2ce24ba4ad0fdfb8d746dcf70e619ecd005b1ac56472b5b86d01a5e75a34bf4aeb5d2ced7c8519f1d0f378f88602e70cd8
7
- data.tar.gz: a4ff78ad190f975ed4635bea15dcd88f413f8e4daf8637f4fe4494818ac59a9db453c7b41443d6b81071d8573976aed90bf5037a2600385630bec569263452b1
6
+ metadata.gz: d5ec9f6d2f97ac583f17b1948c9488f7df31a2b6e85789d2f8877d623c8d9a2403712dde886ff4855061661f9f8af431619727693175d7da05753ba3dd2bbbe1
7
+ data.tar.gz: 6737e74641f4ae7fb60845757f8741bbb082a001f44bf0933c8795157f76b513462e3e38d36de04229e8a5bc16dfbd9217a50ddda70752b223503a367405902e
@@ -287,3 +287,9 @@ en:
287
287
  sql: SQL
288
288
  api: API
289
289
  searchable_columns: Searchable columns
290
+ validate: Validate
291
+ error_message: Error message
292
+ validation_regexp: Validation RegExp
293
+ regexp: RegExp
294
+ message: Message
295
+ should_be_a_valid_regexp: Should be a valid RegExp string
@@ -287,6 +287,12 @@ es:
287
287
  sql: SQL
288
288
  api: API
289
289
  searchable_columns: Columnas de búsqueda
290
+ validate: Validar
291
+ error_message: Mensaje de error
292
+ validation_regexp: Validación RegExp
293
+ regexp: RegExp
294
+ message: Mensaje
295
+ should_be_a_valid_regexp: Debe ser una cadena RegExp válida
290
296
  i:
291
297
  locale: es
292
298
  select:
@@ -283,6 +283,12 @@ pt:
283
283
  sql: SQL
284
284
  api: API
285
285
  searchable_columns: Colunas pesquisáveis
286
+ validate: Validar
287
+ error_message: Mensagem de erro
288
+ validation_regexp: Validação RegExp
289
+ regexp: RegExp
290
+ message: Mensagem
291
+ should_be_a_valid_regexp: Deve ser uma string RegExp válida
286
292
  i:
287
293
  locale: pt
288
294
  select:
@@ -87,9 +87,9 @@ module Motor
87
87
 
88
88
  def name_already_exists?(alert)
89
89
  if alert.new_record?
90
- Alert.exists?(name: alert.name)
90
+ Alert.exists?(name: alert.name, deleted_at: nil)
91
91
  else
92
- Alert.exists?(['name = ? AND id != ?', alert.name, alert.id])
92
+ Alert.exists?(['name = ? AND id != ? AND deleted_at IS NULL', alert.name, alert.id])
93
93
  end
94
94
  end
95
95
  end
@@ -16,7 +16,7 @@ module Motor
16
16
 
17
17
  selected_columns ||= columns.first(SELECT_COLUMNS_AMOUNT)
18
18
 
19
- ([model.primary_key] + selected_columns).sort
19
+ ([model.primary_key] + selected_columns).compact.sort
20
20
  end
21
21
 
22
22
  def find_searchable_columns(model)
@@ -63,9 +63,9 @@ module Motor
63
63
 
64
64
  def title_already_exists?(dashboard)
65
65
  if dashboard.new_record?
66
- Motor::Dashboard.exists?(title: dashboard.title)
66
+ Motor::Dashboard.exists?(title: dashboard.title, deleted_at: nil)
67
67
  else
68
- Motor::Dashboard.exists?(['title = ? AND id != ?', dashboard.title, dashboard.id])
68
+ Motor::Dashboard.exists?(['title = ? AND id != ? AND deleted_at IS NULL', dashboard.title, dashboard.id])
69
69
  end
70
70
  end
71
71
  end
@@ -63,9 +63,9 @@ module Motor
63
63
 
64
64
  def name_already_exists?(form)
65
65
  if form.new_record?
66
- Motor::Form.exists?(['name = ?', form.name])
66
+ Motor::Form.exists?(['name = ? AND deleted_at IS NULL', form.name])
67
67
  else
68
- Motor::Form.exists?(['name = ? AND id != ?', form.name, form.id])
68
+ Motor::Form.exists?(['name = ? AND id != ? AND deleted_at IS NULL', form.name, form.id])
69
69
  end
70
70
  end
71
71
  end
@@ -63,9 +63,9 @@ module Motor
63
63
 
64
64
  def name_already_exists?(query)
65
65
  if query.new_record?
66
- Query.exists?(name: query.name)
66
+ Query.exists?(name: query.name, deleted_at: nil)
67
67
  else
68
- Query.exists?(['name = ? AND id != ?', query.name, query.id])
68
+ Query.exists?(['name = ? AND id != ? AND deleted_at IS NULL', query.name, query.id])
69
69
  end
70
70
  end
71
71
  end
@@ -4,7 +4,8 @@ module Motor
4
4
  module Resources
5
5
  RESOURCE_ATTRS = %w[display_name display_column icon custom_sql visible display_primary_key
6
6
  searchable_columns].freeze
7
- COLUMN_ATTRS = %w[name display_name column_type access_type default_value reference virtual format].freeze
7
+ COLUMN_ATTRS = %w[name display_name column_type access_type default_value reference virtual format
8
+ validators].freeze
8
9
  ASSOCIATION_ATTRS = %w[name display_name model_name icon visible foreign_key primary_key options virtual
9
10
  polymorphic slug].freeze
10
11
  SCOPE_ATTRS = %w[name display_name scope_type preferences visible].freeze
data/lib/motor/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Motor
4
- VERSION = '0.2.35'
4
+ VERSION = '0.2.39'
5
5
  end
@@ -2601,9 +2601,9 @@
2601
2601
  "icons/zoom-out.svg.gz": "icons/zoom-out.svg.gz",
2602
2602
  "icons/zoom-question.svg": "icons/zoom-question.svg",
2603
2603
  "icons/zoom-question.svg.gz": "icons/zoom-question.svg.gz",
2604
- "main-20a597f4a4ce450fb62c.css.gz": "main-20a597f4a4ce450fb62c.css.gz",
2605
- "main-20a597f4a4ce450fb62c.js.LICENSE.txt": "main-20a597f4a4ce450fb62c.js.LICENSE.txt",
2606
- "main-20a597f4a4ce450fb62c.js.gz": "main-20a597f4a4ce450fb62c.js.gz",
2607
- "main.css": "main-20a597f4a4ce450fb62c.css",
2608
- "main.js": "main-20a597f4a4ce450fb62c.js"
2604
+ "main-01a5fc164f7a205535b6.css.gz": "main-01a5fc164f7a205535b6.css.gz",
2605
+ "main-01a5fc164f7a205535b6.js.LICENSE.txt": "main-01a5fc164f7a205535b6.js.LICENSE.txt",
2606
+ "main-01a5fc164f7a205535b6.js.gz": "main-01a5fc164f7a205535b6.js.gz",
2607
+ "main.css": "main-01a5fc164f7a205535b6.css",
2608
+ "main.js": "main-01a5fc164f7a205535b6.js"
2609
2609
  }
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: motor-admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.35
4
+ version: 0.2.39
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pete Matsyburka
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-12-14 00:00:00.000000000 Z
11
+ date: 2021-12-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord-filter
@@ -1526,8 +1526,8 @@ files:
1526
1526
  - ui/dist/icons/zoom-money.svg.gz
1527
1527
  - ui/dist/icons/zoom-out.svg.gz
1528
1528
  - ui/dist/icons/zoom-question.svg.gz
1529
- - ui/dist/main-20a597f4a4ce450fb62c.css.gz
1530
- - ui/dist/main-20a597f4a4ce450fb62c.js.gz
1529
+ - ui/dist/main-01a5fc164f7a205535b6.css.gz
1530
+ - ui/dist/main-01a5fc164f7a205535b6.js.gz
1531
1531
  - ui/dist/manifest.json
1532
1532
  homepage:
1533
1533
  licenses: