madmin 3.1.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20136d0b34c7e92205f9a31340bfd80b335df1493163980e6ad261cd5c0a1adf
-  data.tar.gz: 1a1d960cb9b48a0bd440a33d36f42007ff68427858cc84048a022bc69fb1ad0e
+  metadata.gz: dde4d963db323d7d26197c454095beed2eff86ff40dcd9359e85ee480dd3bc13
+  data.tar.gz: 68566f86e2163ce2b7bf2fd12f6289d786fa118639936eff1aeef5f84feea616
 SHA512:
-  metadata.gz: 2a854ceb5de31a241a3c780d79e3620942e9b2e854e39e1ad00055bdadc7dbccb7e6d490bde3eea07ea4076edd54f208c05fe660626662381b20b9f370adc3af
-  data.tar.gz: fc31f7470dfbff5753fba175ca05f40a66eedfef0ccc62bfabb31b8c4250985716b1fe6d6b20d6b2313409b294dfc2df2287315a08d10a529c7bff255ffcd1d1
+  metadata.gz: 0c2206a2935ec06380389dbca3109acabf2a3f0af8d84105d964b9551bde50c30c8746403aa718b0acd9e397efecb7fe70e74f9b8704d5a2c3d7d8474898305f
+  data.tar.gz: eb2128311c6fd923d69f3d58955e7c9e0bdf322a8949532fc156ec8fec6bba4ab6afd6771d4b06df584a3939ef67ba5879dad16da75611d37816857b92d9582f

data/app/controllers/madmin/resource_controller.rb

@@ -47,12 +47,25 @@ module Madmin
     end
 
     def destroy
-      @record.destroy
-      redirect_to resource.index_path
+      if @record.destroy
+        redirect_to resource.index_path, status: :see_other
+      else
+        destroy_failed destroy_errors
+      end
+    rescue ActiveRecord::DeleteRestrictionError, ActiveRecord::InvalidForeignKey
+      destroy_failed t("madmin.flash.destroy_restricted", name: resource.friendly_name)
     end
 
     private
 
+    def destroy_failed(message)
+      redirect_back_or_to resource.index_path, alert: message, status: :see_other
+    end
+
+    def destroy_errors
+      @record.errors.full_messages.to_sentence.presence || t("madmin.flash.destroy_failed", name: resource.friendly_name)
+    end
+
     def set_record
       @record = resource.model_find(params[:id])
     end

data/config/locales/el.yml

@@ -28,6 +28,8 @@ el:
         other: Υπήρξαν %{count} σφάλματα με την υποβολή σας
     flash:
       readonly: "%{name}: μόνο για ανάγνωση"
+      destroy_failed: "%{name}: η διαγραφή απέτυχε"
+      destroy_restricted: "%{name}: η διαγραφή απέτυχε επειδή άλλες εγγραφές εξαρτώνται από αυτήν"
     confirmations:
       delete: Είστε σίγουροι;
       remove_with_changes: Είστε σίγουροι; Θα χάσετε όλες τις άλλες αλλαγές.

data/config/locales/en.yml

@@ -28,6 +28,8 @@ en:
         other: There were %{count} errors with your submission
     flash:
       readonly: "%{name} is read-only"
+      destroy_failed: "%{name} could not be deleted"
+      destroy_restricted: "%{name} could not be deleted because other records depend on it"
     confirmations:
       delete: Are you sure?
       remove_with_changes: Are you sure? You will lose any other changes.

data/config/locales/fr.yml

@@ -28,6 +28,8 @@ fr:
         other: Il y a eu %{count} erreurs dans votre soumission
     flash:
       readonly: "%{name} est en lecture seule"
+      destroy_failed: "%{name} n'a pas pu être supprimé"
+      destroy_restricted: "%{name} n'a pas pu être supprimé car d'autres enregistrements en dépendent"
     confirmations:
       delete: Êtes-vous sûr ?
       remove_with_changes: Êtes-vous sûr ? Vous perdrez toutes les autres modifications.

data/config/locales/ko.yml

@@ -26,6 +26,9 @@ ko:
       errors:
         one: 제출한 내용에 오류가 1개 있습니다
         other: 제출한 내용에 오류가 %{count}개 있습니다
+    flash:
+      destroy_failed: "%{name}을(를) 삭제할 수 없습니다"
+      destroy_restricted: "다른 레코드가 참조하고 있어 %{name}을(를) 삭제할 수 없습니다"
     confirmations:
       delete: 정말 삭제하시겠습니까?
       remove_with_changes: 정말 제거하시겠습니까? 다른 변경 사항도 함께 사라집니다.

data/lib/madmin/filter.rb

@@ -12,6 +12,9 @@ module Madmin
 
     WITHOUT_VALUE = %w[blank present true false].freeze
 
+    # Operators that match the value as text instead of casting it to the column's type
+    MATCHING_OPERATORS = %w[contains starts_with].freeze
+
     attr_reader :field, :operator, :value
 
     # Skips conditions for unknown columns or operators, and values that don't
@@ -45,15 +48,16 @@ module Madmin
     end
 
     def valid?
-      field&.filter_type.present? && OPERATORS[type].include?(operator) && (typed_value.present? || !value?)
+      field&.filter_type.present? && OPERATORS[type].include?(operator) &&
+        (!value? || (matching_operator? ? value.present? : typed_value.present?))
     end
 
     def apply(scope)
       attribute = scope.arel_table[column]
 
       case operator
-      when "contains" then scope.where(attribute.matches("%#{escaped_value}%"))
-      when "starts_with" then scope.where(attribute.matches("#{escaped_value}%"))
+      when "contains" then scope.where(as_text(attribute).matches("%#{escaped_value}%"))
+      when "starts_with" then scope.where(as_text(attribute).matches("#{escaped_value}%"))
       when "eq" then scope.where(column => typed_value)
       when "gt" then scope.where(attribute.gt(typed_value))
       when "gte" then scope.where(attribute.gteq(typed_value))
@@ -85,12 +89,25 @@ module Madmin
       (type == :array) ? attribute_type.subtype : attribute_type
     end
 
+    def matching_operator?
+      MATCHING_OPERATORS.include?(operator)
+    end
+
+    def uuid?
+      value_type.type == :uuid
+    end
+
+    def as_text(attribute)
+      uuid? ? Arel::Nodes::NamedFunction.new("CAST", [attribute.as("CHAR(36)")]) : attribute
+    end
+
     def escaped_value
       field.model.sanitize_sql_like(value)
     end
 
     def blank_values
-      (type == :string) ? [nil, ""] : nil
+      # UUIDs cast "" to NULL, which would match nothing
+      (type == :string && !uuid?) ? [nil, ""] : nil
     end
   end
 end

data/lib/madmin/version.rb

@@ -1,3 +1,3 @@
 module Madmin
-  VERSION = "3.1.0"
+  VERSION = "3.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madmin
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.2
 platform: ruby
 authors:
 - Chris Oliver