dynamic_scaffold 1.4.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ae10a391fd3152b846f405998031bff697f5cb8f18f0eaea8a8174ac1eb2622
-  data.tar.gz: 67419c013d612ea66b47b2625af31ed4605441e2b90504115ff8514db4c940b5
+  metadata.gz: ec4088a2da9e8c6667356e7adcbc51fca13dd76ab7be8c411b9217ebd052aa1b
+  data.tar.gz: 794a726dda7dde2485b0d3749e5d307f89e29c5724335e369fea0981b714c227
 SHA512:
-  metadata.gz: 412a04548164d48f66c93847d9369d8b7fe965d36a27c1d3507cfe707fb8ec4695f4eadb336a067b601526c9a9700a8adb751417319b6c5f9f0084c0717b59f7
-  data.tar.gz: db36edac7a3069aec267bcbdc9d311a51ae4e9c1df92b42690cf0a52d278512d7b294b8f44b4c2fc6a4f9790440494b93b4e21346b9d46f4acc893bbb48c6ab5
+  metadata.gz: 56db4471671b267e0387a3bdcd5e0c16b50551f8f3b1c73c947a1f7af8db0f9f5e0aca54762d9a7b76fb36bed3baa9bc8a71cc48f32098356cf213044248cd03
+  data.tar.gz: 469fc969cf4b0126785538894f7cc97498d4f39d9d32c1b215c8d6733a576fae63104709fe3b997300004d251fe0e33db8e0abed45871c85169e3f1b690e0b01

data/README.md

@@ -170,6 +170,11 @@ class ShopController < ApplicationController
     # config.list.title do |record|
     #   record.name
     # end
+
+    # You can add class to list page's each row.
+    config.list.row_class do |record|
+      'disabled' unless record.active?
+    end
   
     # First arg is attribute name of model.
     # Last hash arg is given to HTML attributes options.

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 %>">
@@ -30,8 +30,8 @@
       data-confirm-cancel="<%= t('dynamic_scaffold.message.confirm_cancel') %>"
       data-confirm-cancel-class="btn btn-outline-secondary btn-default btn-sm"
     >
-      <%@records.each do |record|%>
-        <li class="ds-list-row js-ds-list-row">
+      <%@records.each_with_index do |record, index|%>
+        <li class="<%= class_names('ds-list-row js-ds-list-row', dynamic_scaffold.list.row_class(record)) %>">
           <% if dynamic_scaffold.list.title? %>
             <div class="ds-list-heading"><%= dynamic_scaffold.list.title(record) %></div>
           <% end %>

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,10 +77,25 @@ module DynamicScaffold
       end
     end
 
-    def update # rubocop:disable Metrics/AbcSize
+    def update # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       values = update_values
       @record = find_record(dynamic_scaffold.model.primary_key => params['id'])
-      prev_values = values.keys.map {|k| [k, @record.public_send(k)] }.to_h.with_indifferent_access
+      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_values) if block_given?
@@ -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/list_builder.rb

@@ -7,6 +7,7 @@ module DynamicScaffold
       @order = []
       @title = nil
       @filter = nil
+      @row_class_block = nil
     end
 
     def pagination(options = nil)
@@ -88,5 +89,13 @@ module DynamicScaffold
       @filter = block if block_given?
       @filter
     end
+
+    def row_class(record = nil, &block)
+      if block_given?
+        @row_class_block = block
+      elsif record.present? && @row_class_block
+        @config.controller.view_context.instance_exec(record, &@row_class_block)
+      end
+    end
   end
 end

data/lib/dynamic_scaffold/version.rb

@@ -1,3 +1,3 @@
 module DynamicScaffold
-  VERSION = '1.4.1'.freeze
+  VERSION = '1.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_scaffold
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Masamoto Miyata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-01 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: classnames-rails-view