avo 1.19.0 → 1.19.1.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe6f8fd6152562419ea4552e39ad441375f04932f9c3e15d4a46562d815a85a3
-  data.tar.gz: 87a5b8936878970adb4be91743166f4fb33105d13110e517848dc865eb606157
+  metadata.gz: e19673d01d04cba52b2ca527f91296c4b4398a0c7c3dcc7a3ebe1fbd77305e4c
+  data.tar.gz: ee63a98ed8f24bdd3baa5f7e43e0822e9e1b339f2f4779917965274a91cacf94
 SHA512:
-  metadata.gz: 65b14a78a7f769504202072693f7b5f648a798989d7e74e7aad0d4909d610cd2ffc4092a39fbe69d8cabdc7ffb69b0d350fac3cb93951f6dc27db9ffd5678ca0
-  data.tar.gz: ca87e17c0fcb5aeee675aee252fa1d872aedab05109981410198376c77b8d79e8159d566bb2db9f0fec1952c1c098113a45fa1e8cbb5fc321c4864f0e80ba57a
+  metadata.gz: b2ea94f80529026b416ee860806a893585f8697453f2f144b22feb1f1b3eab7acdded6ea311949079fd5dc11c2bc99165c23fc4b73bf4c231bf56207ae3ed947
+  data.tar.gz: 438f26330cf7ded3ec531fac77056d2946c51ec20c3ddadb94a3ff0e8299292bd305eb285e68a403050f42eea14c71213ec15f30799999cbaf45fa742158f94b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (1.19.0)
+    avo (1.19.1.pre.1)
       active_link_to
       addressable
       breadcrumbs_on_rails
@@ -227,8 +227,11 @@ GEM
     nokogiri (1.13.1)
       mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
+    nokogiri (1.13.1-x86_64-linux)
+      racc (~> 1.4)
     orm_adapter (0.5.0)
-    pagy (5.7.3)
+    pagy (5.9.3)
+      activesupport
     parallel (1.21.0)
     parser (3.1.0.0)
       ast (~> 2.4.1)

data/app/controllers/avo/base_controller.rb

@@ -5,8 +5,8 @@ module Avo
     before_action :set_resource_name
     before_action :set_resource
     before_action :hydrate_resource
-    before_action :authorize_action
     before_action :set_model, only: [:show, :edit, :destroy, :update]
+    before_action :authorize_action
     before_action :reset_pagination_if_filters_changed, only: :index
     before_action :cache_applied_filters, only: :index
 
@@ -127,7 +127,7 @@ module Avo
             resource_path(model: @model, resource: @resource)
           end
 
-          format.html { redirect_to redirect_path, notice: "#{@model.class.name} was successfully created." }
+          format.html { redirect_to redirect_path, notice: "#{@model.class.name} #{t("avo.was_successfully_created")}." }
           format.json { render :show, status: :created, location: @model }
         else
           flash[:error] = t "avo.you_missed_something_check_form"
@@ -144,7 +144,7 @@ module Avo
 
       respond_to do |format|
         if saved
-          format.html { redirect_to params[:referrer] || resource_path(model: @model, resource: @resource), notice: "#{@model.class.name} was successfully updated." }
+          format.html { redirect_to params[:referrer] || resource_path(model: @model, resource: @resource), notice: "#{@model.class.name} #{t("avo.was_successfully_updated")}." }
           format.json { render :show, status: :ok, location: @model }
         else
           flash[:error] = t "avo.you_missed_something_check_form"

data/lib/avo/fields/base_field.rb

@@ -19,7 +19,6 @@ module Avo
       attr_reader :nullable
       attr_reader :null_values
       attr_reader :format_using
-      attr_reader :placeholder
       attr_reader :help
       attr_reader :default
       attr_reader :visible
@@ -57,7 +56,7 @@ module Avo
         @nullable = args[:nullable] || false
         @null_values = args[:null_values] || [nil, ""]
         @format_using = args[:format_using] || nil
-        @placeholder = args[:placeholder] || id.to_s.humanize(keep_id_suffix: true)
+        @placeholder = args[:placeholder]
         @help = args[:help] || nil
         @default = args[:default] || nil
         @visible = args[:visible] || true
@@ -103,6 +102,12 @@ module Avo
         @id.to_s.humanize(keep_id_suffix: true)
       end
 
+      def placeholder
+        return @placeholder if @placeholder.present?
+
+        name
+      end
+
       def visible?
         if visible.present? && visible.respond_to?(:call)
           visible.call resource: @resource

data/lib/avo/fields/key_value_field.rb

@@ -15,10 +15,10 @@ module Avo
 
         hide_on :index
 
-        @key_label = args[:key_label].present? ? args[:key_label].to_s : "Key"
-        @value_label = args[:value_label].present? ? args[:value_label].to_s : "Value"
-        @action_text = args[:action_text].present? ? args[:action_text].to_s : "Add row"
-        @delete_text = args[:delete_text].present? ? args[:delete_text].to_s : "Delete row"
+        @key_label = args[:key_label].present? ? args[:key_label].to_s : I18n.translate('avo.key_value_field.key')
+        @value_label = args[:value_label].present? ? args[:value_label].to_s : I18n.translate('avo.key_value_field.value')
+        @action_text = args[:action_text].present? ? args[:action_text].to_s : I18n.translate('avo.key_value_field.add_row')
+        @delete_text = args[:delete_text].present? ? args[:delete_text].to_s : I18n.translate('avo.key_value_field.delete_row')
 
         @disable_editing_keys = args[:disable_editing_keys].present? ? args[:disable_editing_keys] : false
         # disabling editing keys also disables adding rows (doesn't take into account the value of disable_adding_rows)

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "1.19.0"
+  VERSION = "1.19.1.pre.1"
 end

data/lib/generators/avo/templates/locales/avo.en.yml

@@ -8,7 +8,7 @@ en:
     run: 'Run'
     cancel: 'Cancel'
     action_ran_successfully: 'Action ran successfully!'
-    resource_details: "%{item} details: %{title}"
+    resource_details: '%{item} details: %{title}'
     update_item: 'update %{item}: %{title}'
     unauthorized: 'Unauthorized'
     attachment_class_attached: '%{attachment_class} attached.'
@@ -16,8 +16,8 @@ en:
     resource_updated: 'Resource updated'
     resource_created: 'Resource created'
     resource_destroyed: 'Resource destroyed'
-    switch_to_view: "Switch to %{view_type} view"
-    click_to_reveal_filters: "Click to reveal filters"
+    switch_to_view: 'Switch to %{view_type} view'
+    click_to_reveal_filters: 'Click to reveal filters'
     attachment_destroyed: 'Attachment destroyed'
     failed_to_find_attachment: 'Failed to find attachment'
     you_missed_something_check_form: 'You might have missed something. Please check the form.'
@@ -86,3 +86,10 @@ en:
     sign_out: 'Sign out'
     failed: 'Failed'
     failed_to_load: 'Failed to load'
+    key_value_field:
+      key: 'Key'
+      value: 'Value'
+      add_row: 'Add row'
+      delete_row: 'Delete row'
+    was_successfully_created: 'was successfully created'
+    was_successfully_updated: 'was successfully updated'

data/lib/generators/avo/templates/locales/avo.ro.yml

@@ -71,3 +71,10 @@ ro:
       placeholder: 'Cauta'
       cancel_button: 'Anulare'
     sign_out: 'Delogare'
+    key_value_field:
+      key: 'Cheie'
+      value: 'Valoare'
+      add_row: 'Adauga rand'
+      delete_row: 'Sterge rand'
+    was_successfully_created: 'a fost creat'
+    was_successfully_updated: 'a fost actualizat'