madmin 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20136d0b34c7e92205f9a31340bfd80b335df1493163980e6ad261cd5c0a1adf
-  data.tar.gz: 1a1d960cb9b48a0bd440a33d36f42007ff68427858cc84048a022bc69fb1ad0e
+  metadata.gz: f115a8b369e2c84e6eda3dd65cd7734f9fc3ba4ec6c49679552202af4b651d66
+  data.tar.gz: 18b426fbe6ae3f17945d57b9bf6be94d7e063ea4f6fb71669443cce95ec38b02
 SHA512:
-  metadata.gz: 2a854ceb5de31a241a3c780d79e3620942e9b2e854e39e1ad00055bdadc7dbccb7e6d490bde3eea07ea4076edd54f208c05fe660626662381b20b9f370adc3af
-  data.tar.gz: fc31f7470dfbff5753fba175ca05f40a66eedfef0ccc62bfabb31b8c4250985716b1fe6d6b20d6b2313409b294dfc2df2287315a08d10a529c7bff255ffcd1d1
+  metadata.gz: a044fdc4cd021c9bb2d68586a07f2fbb446ac8722ffba771278a8778171b99172cafa97ccc05871cfbef7a95cc3b779ea4a78bb823b90aafc56fbabd52a217a3
+  data.tar.gz: 6b287859f38758d12edb7a4dcc50161b1f7147c233fc8ffc3aed30cfc9c6dd9d71c55d82edf258096210c6001b5b476a9e0350cdbe32b23233a79162ba668383

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/version.rb

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

metadata

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