dynamic_scaffold 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76369253caa437f8e867900e860b295055e087c9a305215239ef1d70e40e22b8
-  data.tar.gz: 957625148912b7291c7ad8fe0af232c291eb42a369ac32b6c2d54f5c1c4e8170
+  metadata.gz: c38dbab86d238886a3fc797a81804715a0b4299473cda34cbee0878f6c17500e
+  data.tar.gz: 9a2c173022936a56a7d6af715d60c71accadf070c9d34698af8a2512c841ee07
 SHA512:
-  metadata.gz: d544f44c76007716567503200dfb66fa33311ff73aad7db0482a70746b4889f54bb3c016ac9ed04d850fa881e32f8afd098b9d2f3c5b3fb182a67d2acec556b8
-  data.tar.gz: 2dbd1c064951d4217cca523a93be7575a4b39f159d2d057151dfbca9dbb5a33a5bd9bebc2749588db8d69e0be2d03045905a53144e20b10a1d9573afc1257bc2
+  metadata.gz: 93cc76ad613015794c0cdbb260e0d2e94c5246997bbadffa9d89c18839224439f7101ab6ccafa42b1e740aa57288888db93a8fa87ff1ea6430404606b773c537
+  data.tar.gz: 842c32cce00a22e526bb1db3f9adc5f017ec188e5b8fd2ec0a91c693e999fc5e46de3272b80884cad0b60c27138afe31e17faeb89477540f905cabcd8ed77a53

data/app/views/dynamic_scaffold/bootstrap/_list.html.erb

@@ -1,6 +1,6 @@
 <%unless flash[:dynamic_scaffold_danger].nil? -%>
   <div class="alert alert-danger" role="alert">
-    <%= flash[:dynamic_scaffold_danger] %>
+    <%== flash[:dynamic_scaffold_danger] %>
   </div>
 <%end%>
 <input type="hidden" class="authenticity_param_name" value="<%= request_forgery_protection_token %>">

data/app/views/dynamic_scaffold/bootstrap/form/_row.html.erb

@@ -3,9 +3,9 @@
     <%= elem.render(self, form) %>
   <% else %>
     <%- errors = elem.errors(form) -%>
-    <div class="<%= class_names('form-group', 'has-error': errors.present?) %>">
+    <div class="<%= class_names('form-group', 'has-error': errors.present?) %>" data-name="<%= elem.unique_name %>">
       <%= elem.render_label(self, depth) %>
-      <div>
+      <div class="ds-form-item">
         <%- elem.insert(:before).each do |block| -%>
           <%= self.instance_exec(@record, &block) %>
         <%-end-%>

data/lib/dynamic_scaffold/controller.rb

@@ -77,13 +77,28 @@ module DynamicScaffold
       end
     end
 
-    def update
+    def update # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       values = update_values
       @record = find_record(dynamic_scaffold.model.primary_key => params['id'])
-      prev_attribute = @record.attributes
+      datetime_select_keys = []
+      prev_values = values.keys.map do |k|
+        # handle paramters like `start_time(1i)`
+        match = k.match(/(.*?)\(\d+i\)/)
+        if match
+          next if datetime_select_keys.include?(match[1])
+
+          datetime_select_keys << k = match[1]
+        end
+
+        # globalize
+        next [:translations_attributes, @record.translations] if k == 'translations_attributes'
+
+        [k, @record.public_send(k)]
+      end.compact.to_h.with_indifferent_access
+
       @record.attributes = values
       dynamic_scaffold.model.transaction do
-        yield(@record, prev_attribute) if block_given?
+        yield(@record, prev_values) if block_given?
         if @record.save
           redirect_to dynamic_scaffold_path(:index, request_queries)
         else
@@ -92,7 +107,7 @@ module DynamicScaffold
       end
     end
 
-    def destroy
+    def destroy # rubocop:disable Metrics/AbcSize
       # `Destroy` also does not support multiple primary keys too.
       record = find_record(dynamic_scaffold.model.primary_key => params['id'])
       begin
@@ -107,6 +122,9 @@ module DynamicScaffold
         flash[:dynamic_scaffold_danger] = I18n.t('dynamic_scaffold.alert.destroy.failed')
         logger.error(e)
       end
+
+      flash[:dynamic_scaffold_danger] = record.errors[:base].join('<br>') if record.errors[:base].any?
+
       redirect_to dynamic_scaffold_path(:index, request_queries)
     end
 

data/lib/dynamic_scaffold/form/item/base.rb

@@ -31,6 +31,10 @@ module DynamicScaffold
           @label_block = nil
         end
 
+        def unique_name
+          "#{@config.model.table_name}_#{name}"
+        end
+
         def notes?
           !@notes.empty?
         end
@@ -95,7 +99,7 @@ module DynamicScaffold
           #   return label unless label.nil?
           # end
 
-          view.tag.label(proxy_field.label, label_attrs)
+          view.tag.label(proxy_field.label, label_attrs) if proxy_field.label.present?
         end
 
         def extract_parameters(permitting)

data/lib/dynamic_scaffold/version.rb

@@ -1,3 +1,3 @@
 module DynamicScaffold
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_scaffold
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Masamoto Miyata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-31 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: classnames-rails-view