dynamic_scaffold 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c5c6ffc040bc5b732799e02be73ade7950d28950e8b1769f574c61ecb126f7e
-  data.tar.gz: c34716b1c1896bd321616d6d5ad8018a7299ef892317ad9d8ea4ed02cedbc5e7
+  metadata.gz: 457314cf971c919f920535659152e9062cd0f095c51d3f4626fb12f956bda42e
+  data.tar.gz: a9fe3e3a6041b2dc15d305f291f63d07447427e673988c5acd68313d8f643351
 SHA512:
-  metadata.gz: d09f5c854cdecebcbfdfa42230871e8438684399d088f275603dc326741488e31543f74ac3ddc5a391e71775c2f3ed4d10f1a6b01395a5e54f5c7e08987d19fa
-  data.tar.gz: c8ad8ed86a3d2e56894c067fb95c05ba52a89a8858ac7f1289ad1fca5ec6d2737be056c511d0c39cf36feb1bfb112d9c8c472be7afa784622155b51bd0a2c68f
+  metadata.gz: 525cf1961b472037098f5d1425ae9177b2b175712c6c353a2f80692fc630dfa93d082d4d95977a3d2e3f7fc0004053e068ee5481dfd65e34802550482662542f
+  data.tar.gz: 79896456eaaff29d55b69fad3eb63508fe6ceb199f49fdab356f4b76db9373401cb3b4becee9cd682492713c4211616964753ce42df0f6ed9d47eda7ac9e729c

data/config/locales/en.yml

@@ -9,12 +9,22 @@ en:
         index: 'List'
         edit: 'Edit'
         new: 'Create'
+    button:
+      add: 'Add'
+      edit: 'Edit'
+      save_order: 'Sort'
+      save: 'Save'
+      back: 'Back'
     message:
       no_records: '%{model} was not found.'
       destroy_confirm: 'Are you sure you want to delete this?'
       confirm_cancel: 'Cancel'
       confirm_ok: 'OK'
+      sort_error: 'The sort has been failed, because the following record failed to save.'
     alert:
       destroy:
         invalid_foreign_key: 'That item can not be deleted because it has associated record(s).'
-        failed: 'That item can not be deleted'
+        failed: 'That item can not be deleted'
+  views:
+    pagination:
+      truncate: '…'

data/config/locales/ja.yml

@@ -20,6 +20,7 @@ ja:
       destroy_confirm: '削除します。よろしいですか？'
       confirm_cancel: 'キャンセル'
       confirm_ok: 'OK'
+      sort_error: '下記のレコードの保存に失敗したため、ソートを完了できませんでした。'
     alert:
       destroy:
         invalid_foreign_key: '関連づいたレコードがあるので削除できません。'

data/lib/dynamic_scaffold/controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DynamicScaffold
-  module Controller
+  module Controller # rubocop:disable Metrics/ModuleLength
     extend ActiveSupport::Concern
     include ControllerUtilities
 
@@ -137,18 +137,26 @@ module DynamicScaffold
       redirect_to dynamic_scaffold_path(:index, request_queries)
     end
 
-    def sort
+    def sort # rubocop:disable Metrics/AbcSize
       pkeys_list = sort_params
       reset_sequence(pkeys_list.size)
-      dynamic_scaffold.model.transaction do
-        pkeys_list.each do |pkeys|
-          rec = find_record(pkeys.to_hash)
-          next_sec = next_sequence!
-          rec[dynamic_scaffold.list.sorter_attribute] = next_sec
-          yield(rec) if block_given?
-          rec.save!
+
+      begin
+        dynamic_scaffold.model.transaction do
+          pkeys_list.each do |pkeys|
+            rec = find_record(pkeys.to_hash)
+            next_sec = next_sequence!
+            rec[dynamic_scaffold.list.sorter_attribute] = next_sec
+            yield(rec) if block_given?
+            rec.save!
+          end
         end
+      rescue ActiveRecord::RecordInvalid => e
+        messages = [I18n.t('dynamic_scaffold.message.sort_error'), '', sort_validation_error_title(e.record)]
+        messages.concat(e.record.errors.full_messages)
+        flash[:dynamic_scaffold_danger] = messages.join('<br>')
       end
+
       redirect_to dynamic_scaffold_path(:index, request_queries)
     end
   end

data/lib/dynamic_scaffold/controller_utilities.rb

@@ -147,5 +147,9 @@ module DynamicScaffold
           .page(params[dynamic_scaffold.list.pagination.param_name])
           .per(dynamic_scaffold.list.pagination.per_page)
       end
+
+      def sort_validation_error_title(record)
+        "ID: #{record.id}"
+      end
   end
 end

data/lib/dynamic_scaffold/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DynamicScaffold
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_scaffold
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Masamoto Miyata
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: classnames-rails-view