dynamic_scaffold 1.4.2 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f6b62c290ce99a5fa514f83e0998cef5d7e85af27e3bba74414b759d2031934
-  data.tar.gz: 6109815b67cbc151a20534021b9c8b8381262bb972cde348665fa0fc66f0bf7d
+  metadata.gz: a42e42644e59b8b8f43dfe73eed5089f76f471c20bbd788c44c2e3eb0ba68ea3
+  data.tar.gz: aaa19ee4e6ff49e27e12c1383f7ec3233ec3dcb436eca830b52c4fe5b2901d85
 SHA512:
-  metadata.gz: a5bb524f13d06670c74cee5516b63b902880485b3a60c56f97dba78bcd83e9b844c58bf47bd2663e611ed7d53049c34e14a66dfa80363ec0060be074ae92cbdd
-  data.tar.gz: '01904df0fd4fccfeb9d226b9d5f7fbeb79f5c5b427b5c0a2d8d6c14636668dc0c0bbfd2d9f5d7f854b2dc8cd146cbc5d77e3a4584d4e1cd4735d1dd0f0772859'
+  metadata.gz: aa010c42fbdbf64be8d31c8eb2323ba27219dd94639ea8d10de646b9b028deef6400b7aba98463e62b2bb98dfe01e9aa2f6a4dcb84ead17e65555af1e79dfd24
+  data.tar.gz: b06d1e642763f3b399a098316bb4de3bc8af90bb3765d3fb22bf13bc525c57115c4a6cbafe25d4b4b9ae941d8ff3bdffeebacf975e2bb977948c0978e9ae2745

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,7 +77,7 @@ 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'])
       datetime_select_keys = []
@@ -89,6 +89,10 @@ module DynamicScaffold
 
           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
 
@@ -103,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
@@ -118,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.2'.freeze
+  VERSION = '1.7.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_scaffold
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.7.1
 platform: ruby
 authors:
 - Masamoto Miyata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-04 00:00:00.000000000 Z
+date: 2021-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: classnames-rails-view
@@ -47,7 +47,7 @@ dependencies:
         version: '5.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '5.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement