inline_forms 7.2.11 → 7.9.1

data/app/controllers/inline_forms_controller.rb

@@ -44,7 +44,12 @@ class InlineFormsController < ApplicationController
       foreign_key = @Klass.reflect_on_association(@parent_class.underscore.to_sym).options[:foreign_key] || @parent_class.foreign_key
       conditions =  [ "#{foreign_key} = ?", @parent_id ]
     end
-    # if we are using cancan, then make sure to select only accessible records
+    # CanCan's load_and_authorize_resource sets @apartments (etc.); keep @objects in sync.
+    collection_ivar = :"@#{controller_name}"
+    if instance_variable_defined?(collection_ivar)
+      loaded = instance_variable_get(collection_ivar)
+      @objects = loaded unless loaded.nil?
+    end
     @objects ||= @Klass.accessible_by(current_ability) if cancan_enabled?
     @objects ||= @Klass
     @objects = @objects.order(@Klass.table_name + "." + @Klass.order_by_clause) if @Klass.respond_to?(:order_by_clause) && ! @Klass.order_by_clause.nil?
@@ -72,14 +77,21 @@ class InlineFormsController < ApplicationController
       if @Klass.not_accessible_through_html?
         format.html do
           if @parent_class.present?
-            frame_layout = turbo_frame_request? ? "turbo_rails/frame" : "inline_forms"
-            render "inline_forms/_list", layout: frame_layout
+            render_nested_associated_list_html
           end
         end
       else
-        format.html { render 'inline_forms/_list', :layout => 'inline_forms' }
+        format.html do
+          if @parent_class.present?
+            render_nested_associated_list_html
+          elsif turbo_frame_request? && list_frame_id?(params[:update])
+            @ul_needed = true
+            render "inline_forms/_list", layout: "turbo_rails/frame"
+          else
+            render "inline_forms/_list", layout: "inline_forms"
+          end
+        end
       end
-      format.js { render :list }
     end
   end
 
@@ -98,8 +110,7 @@ class InlineFormsController < ApplicationController
 
     @object.inline_forms_attribute_list = @inline_forms_attribute_list if @inline_forms_attribute_list
     respond_to do |format|
-      format.html { render 'inline_forms/_new', :layout => 'inline_forms' } unless @Klass.not_accessible_through_html?
-      format.js { }
+      format.html { render_turbo_new } if html_list_flow_allowed?
     end
   end
 
@@ -111,8 +122,7 @@ class InlineFormsController < ApplicationController
     @sub_id = params[:sub_id]
     @update_span = params[:update]
     respond_to do |format|
-      format.html { } unless @Klass.not_accessible_through_html?
-      format.js { }
+      format.html { render_turbo_field(:field_edit) }
     end
   end
 
@@ -123,7 +133,8 @@ class InlineFormsController < ApplicationController
     @update_span = params[:update]
     attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list
     attributes.each do | attribute, name, form_element |
-      send("#{form_element.to_s}_update", @object, attribute) unless form_element == :tree || form_element == :associated || (cancan_enabled? && cannot?(:read, @object, attribute))
+      InlineForms.assert_plain_text_column!(object: @object, attribute: attribute, form_element: form_element)
+      send("#{form_element.to_s}_update", @object, attribute) unless form_element == :associated || (cancan_enabled? && cannot?(:read, @object, attribute))
     end
     @parent_class = params[:parent_class]
     @parent_id = params[:parent_id]
@@ -145,14 +156,14 @@ class InlineFormsController < ApplicationController
       @objects = @objects.where(conditions).paginate(:page => params[:page])
       @object = nil
       respond_to do |format|
-        format.js { render :list}
+        format.html { render_list_frame_after_save } if html_list_flow_allowed?
       end
     else
       flash.now[:header] = ["Kan #{@object.class.to_s.underscore} niet aanmaken."]
       flash.now[:error] = @object.errors.to_a
       respond_to do |format|
         @object.inline_forms_attribute_list = attributes
-        format.js { render :new}
+        format.html { render_turbo_new } if html_list_flow_allowed?
       end
     end
   end
@@ -164,11 +175,11 @@ class InlineFormsController < ApplicationController
     @form_element = params[:form_element]
     @sub_id = params[:sub_id]
     @update_span = params[:update]
+    InlineForms.assert_plain_text_column!(object: @object, attribute: @attribute, form_element: @form_element)
     send("#{@form_element.to_s}_update", @object, @attribute)
     @object.save
     respond_to do |format|
-      format.html { } unless @Klass.not_accessible_through_html?
-      format.js { }
+      format.html { render_turbo_field(:field_show, turbo_field_show: true) }
     end
   end
 
@@ -195,15 +206,14 @@ class InlineFormsController < ApplicationController
       respond_to do |format|
         @attributes = @object.inline_forms_attribute_list
         if close
-          format.js { render :close }
+          format.html { render_row_turbo(:close) } if row_html_turbo_allowed?
         else
-          format.js { }
+          format.html { render_row_turbo(:show) } if row_html_turbo_allowed?
         end
       end
     else
       respond_to do |format|
-        format.html { } unless @Klass.not_accessible_through_html?
-        format.js { render :show_element }
+        format.html { render_turbo_field(:field_show, turbo_field_show: true) }
       end
     end
   end
@@ -212,11 +222,9 @@ class InlineFormsController < ApplicationController
   def soft_delete
     @update_span = params[:update]
     @object = referenced_object
-    # destroy the object
     @object.soft_delete(current_user)
     respond_to do |format|
-      format.html { } unless @Klass.not_accessible_through_html?
-      format.js { render :close }
+      format.html { render_row_turbo(:close) } if row_html_turbo_allowed?
     end
   end
 
@@ -224,11 +232,9 @@ class InlineFormsController < ApplicationController
   def soft_restore
     @update_span = params[:update]
     @object = referenced_object
-    # restore the object
     @object.soft_restore
     respond_to do |format|
-      format.html { } unless @Klass.not_accessible_through_html?
-      format.js { render :close }
+      format.html { render_row_turbo(:close) } if row_html_turbo_allowed?
     end
   end
 
@@ -237,29 +243,46 @@ class InlineFormsController < ApplicationController
     @update_span = params[:update]
     @object = referenced_object
     if current_user.role? :superadmin
-      # destroy the object
-      @undo_object = @object.versions.last
+      @undo_version = @object.versions.last
       @object.destroy
       respond_to do |format|
-        format.html { } unless @Klass.not_accessible_through_html?
-        format.js { render :record_destroyed }
+        format.html { render_row_turbo_destroyed } if row_html_turbo_allowed?
       end
     end
   end
 
   # :revert works like undo.
   # Thanks Ryan Bates: http://railscasts.com/episodes/255-undo-with-paper-trail
+  #
+  # Two reify paths:
+  #
+  # * Primary version: the reified object IS the row (Apartment, Photo, ...).
+  #   Save it and we're done; CarrierWave keeps the previous file on disk
+  #   (see app/uploaders/image_uploader.rb) so a restored `image` column
+  #   still points at real bytes.
+  # * ActionText (rich_text) version: the reified object is the
+  #   `ActionText::RichText` row hanging off the parent. Save the rich text,
+  #   then `touch` the parent so any timestamp display refreshes. Frame ids
+  #   below derive from `@parent` for both branches.
   def revert
     @update_span = params[:update]
-    @object = referenced_object
     if current_user.role? :superadmin
       @version = PaperTrail::Version.find(params[:id])
-      @version.reify.save!
-      @object = @Klass.find(@version.item_id)
-      authorize!(:revert, @object) if cancan_enabled?
+      @object = @version.reify
+      if defined?(ActionText::RichText) && @object.is_a?(ActionText::RichText)
+        @rich_text_record = @object
+        @parent = @rich_text_record.record
+        @rich_text_record.save!
+        @parent.touch if @parent.respond_to?(:touch)
+      else
+        @parent = @object
+        @parent.save!
+      end
+      authorize!(:revert, @parent) if cancan_enabled?
+      return unless row_html_turbo_allowed?
+
       respond_to do |format|
-        format.html { } unless @Klass.not_accessible_through_html?
-        format.js { render :close }
+        format.turbo_stream { render_revert_turbo_streams }
       end
     end
   end
@@ -277,11 +300,139 @@ class InlineFormsController < ApplicationController
   end
 
   private
+
+  # Versions list lives in +<turbo-frame id="…_versions">+; POST +restore+ would otherwise
+  # send +Turbo-Frame: …_versions+ while +row_close+ only returns the row frame. Stream
+  # replaces both the row and the versions panel in one response.
+  def render_revert_turbo_streams
+    row_id = helpers.inline_forms_row_turbo_frame_id(@parent)
+    versions_id = "#{@parent.class.name.underscore}_#{@parent.id}_versions"
+    row_html = render_to_string(
+      "inline_forms/row_close",
+      layout: false,
+      formats: [:html],
+      locals: { update_span: row_id, object: @parent, inline_forms_turbo_row: true }
+    )
+    versions_html = render_to_string(
+      "inline_forms/versions_panel",
+      layout: false,
+      formats: [:html],
+      locals: { update_span: versions_id, object: @parent, inline_forms_turbo_row: true }
+    )
+    render turbo_stream: [
+      turbo_stream.replace(row_id, row_html),
+      turbo_stream.replace(versions_id, versions_html)
+    ]
+  end
+
+  # HTML field edit/show inside a +<turbo-frame>+ (Step 3). Scalar fields no longer
+  # use UJS; +format.html+ is always registered for edit/update/single-attribute show.
+  #
+  # +@inline_forms_turbo_field+ tells +link_to_inline_edit+ (and the per-+form_element+
+  # +*_show+ helpers it wraps) to emit Turbo data attributes. The flag is set in
+  # +_show.html.erb+ when a row first opens, but bare +field_show+ / +field_edit+
+  # responses (on +cancel+ / +update+) do not re-render +_show+. Without setting
+  # it here the link in the swapped frame would not target the field frame and
+  # inline edit would not open reliably.
+  def render_turbo_field(template, turbo_field_show: false)
+    @turbo_frame = true if template == :field_edit
+    @turbo_field_show_turbo_frame = turbo_field_show
+    @inline_forms_turbo_field = true
+    render "inline_forms/#{template}", layout: "turbo_rails/frame"
+  end
+
+  # Top-level list row open/close (Step 3): full `_show` / `_close` inside
+  # `<turbo-frame id="…">` matching `params[:update]`.
+  def render_row_turbo(mode)
+    @inline_forms_turbo_row = true
+    template = (mode == :close) ? "inline_forms/row_close" : "inline_forms/row_show"
+    layout = turbo_frame_request? ? "turbo_rails/frame" : "inline_forms"
+    render template, layout: layout
+  end
+
+  def render_row_turbo_destroyed
+    @inline_forms_turbo_row = true
+    layout = turbo_frame_request? ? "turbo_rails/frame" : "inline_forms"
+    render "inline_forms/row_destroyed", layout: layout
+  end
+
+  # Nested has_many +new+ / cancel / +create+ inside a parent +<turbo-frame>+ (e.g. Apartment → Photo).
+  def html_list_flow_allowed?
+    params[:update].present? && (@parent_class.present? || !@Klass.not_accessible_through_html?)
+  end
+
+  def associated_list_html_allowed?
+    @parent_class.present? && params[:update].present?
+  end
+
+  def list_frame_id?(update)
+    update.present? && update.to_s.end_with?("_list")
+  end
+
+  def render_list_frame_after_save
+    @ul_needed = true
+    render "inline_forms/create_list_frame", layout: associated_list_frame_layout
+  end
+
+  def associated_list_frame_layout
+    # Use full inline_forms chrome so the swapped frame is styled; Turbo extracts
+    # the matching <turbo-frame id="…"> from the response body.
+    "inline_forms"
+  end
+
+  def render_turbo_new
+    @turbo_frame = true
+    render "inline_forms/new_record", layout: associated_list_frame_layout
+  end
+
+  # Nested +index+ / cancel / +create+ HTML inside a parent-associated +<turbo-frame>+.
+  def render_nested_associated_list_html
+    if turbo_frame_request? && nested_list_frame_id?(params[:update])
+      # Pagination and other swaps targeting the inner +…_photos_list+ frame: minimal layout.
+      @ul_needed = true
+      render "inline_forms/_list", layout: "turbo_rails/frame"
+    elsif turbo_frame_request? && params[:update].present?
+      # Cancel / +create+ targeting the outer +apartment_<id>_photos+ frame: styled full layout.
+      render_associated_list_frame
+    else
+      frame_layout = turbo_frame_request? ? "turbo_rails/frame" : "inline_forms"
+      render "inline_forms/_list", layout: frame_layout
+    end
+  end
+
+  # +apartment_1_photos_list+ (inner list) vs +apartment_1_photos+ (outer associated container).
+  def nested_list_frame_id?(update)
+    update.to_s.end_with?("_list")
+  end
+
+  # After nested +create+ / cancel; restores list inside the outer associated frame.
+  def render_associated_list_frame
+    @ul_needed = true
+    render "inline_forms/create_list_frame", layout: associated_list_frame_layout
+  end
+
+  # HTML row open/close is allowed for normal models, and for +not_accessible_through_html?+
+  # models (e.g. Photo) when the request targets a nested associated list row
+  # (+params[:update]+ like +apartment_1_photo_5+), not bare top-level CRUD.
+  def row_html_turbo_allowed?
+    return true unless @Klass.not_accessible_through_html?
+    nested_associated_list_row_update?(params[:update])
+  end
+
+  # +apartment_1_photo_5+ → +["apartment","1","photo","5"]+ (≥4 segments, trailing id).
+  # Differs from field spans (+apartment_1_photo_5_name+ ends with letters) and
+  # top-level rows (+apartment_1+ — too few segments).
+  def nested_associated_list_row_update?(update)
+    parts = update.to_s.split("_")
+    parts.length >= 4 && parts.last.match?(/\A\d+\z/)
+  end
+
   # Get the class from the controller name.
   # CountryController < InlineFormsController, so what class are we?
   # TODO think about this a bit more.
   def getKlass #:doc:
     @Klass = self.controller_name.classify.constantize
+    InlineForms.validate_plain_text_configuration_for!(@Klass)
     @Klass
   end
 

data/app/helpers/form_elements/ckeditor.rb

@@ -1,41 +1,15 @@
 # -*- encoding : utf-8 -*-
+# Legacy type name: CKEditor is removed; behaves like :rich_text.
 InlineForms::SPECIAL_COLUMN_TYPES[:ckeditor]=:text
 
 def ckeditor_show(object, attribute)
-    link_to_inline_edit object,
-      attribute,
-      '<div class="ckeditor_area">'.html_safe +
-      cktext_area_tag(
-      attribute,
-      object[attribute],
-      :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
-      :ckeditor => {  :width => '100%',
-                      :height => '200px',
-                      :toolbar => "None",
-                      :readOnly => "true",
-                      :resize_enabled => "false",
-                      :toolbarCanCollapse => "false"
-                    }
-    ) +
-      image_tag(  'inline_forms/glass_plate.gif',
-                  :class => "glass_plate",
-                  :title => '' ) +
-      "<script>delete CKEDITOR.instances['textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}']</script>".html_safe +
-      '</div>'.html_safe,
-      from_callee: __callee__
+  rich_text_show(object, attribute)
 end
 
 def ckeditor_edit(object, attribute)
-    cktext_area_tag( attribute,
-                    object[attribute],
-                    :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
-                    :ckeditor => {  :width => '100%',
-                                    :height => '200px'
-                                  }
-                  ) +
-    "<script>delete CKEDITOR.instances['textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}']</script>".html_safe
+  rich_text_edit(object, attribute)
 end
 
 def ckeditor_update(object, attribute)
-  object[attribute.to_sym] = params[attribute.to_sym]
+  rich_text_update(object, attribute)
 end

data/app/helpers/form_elements/plain_text.rb

@@ -0,0 +1,23 @@
+# -*- encoding : utf-8 -*-
+InlineForms::SPECIAL_COLUMN_TYPES[:plain_text]=:text
+
+def plain_text_show(object, attribute)
+  InlineForms.assert_plain_text_column!(object: object, attribute: attribute, form_element: :plain_text)
+  value = object[attribute]
+  link_to_inline_edit object, attribute, (value.nil? || value.empty?) ? "<i class='fi-plus'></i>".html_safe : value, from_callee: __callee__
+end
+
+def plain_text_edit(object, attribute)
+  InlineForms.assert_plain_text_column!(object: object, attribute: attribute, form_element: :plain_text)
+  text_area_tag attribute, object[attribute], :class => 'attribute_text_area'
+end
+
+def plain_text_update(object, attribute)
+  InlineForms.assert_plain_text_column!(object: object, attribute: attribute, form_element: :plain_text)
+  object[attribute.to_sym] = params[attribute.to_sym]
+end
+
+def plain_text_info(object, attribute)
+  InlineForms.assert_plain_text_column!(object: object, attribute: attribute, form_element: :plain_text)
+  object[attribute]
+end

data/app/helpers/form_elements/plain_text_area.rb

@@ -2,13 +2,17 @@
 InlineForms::SPECIAL_COLUMN_TYPES[:plain_text_area]=:text
 
 def plain_text_area_show(object, attribute)
-  link_to_inline_edit object, attribute, (object[attribute].nil? || object[attribute].empty?) ? "<i class='fi-plus'></i>".html_safe : object[attribute], from_callee: __callee__
+  plain_text_show(object, attribute)
 end
 
 def plain_text_area_edit(object, attribute)
-  text_area_tag attribute, object[attribute], :class => 'attribute_text_area'
+  plain_text_edit(object, attribute)
 end
 
 def plain_text_area_update(object, attribute)
-  object[attribute.to_sym] = params[attribute.to_sym]
+  plain_text_update(object, attribute)
+end
+
+def plain_text_area_info(object, attribute)
+  plain_text_info(object, attribute)
 end

data/app/helpers/form_elements/text_area.rb

@@ -2,57 +2,17 @@
 InlineForms::SPECIAL_COLUMN_TYPES[:text_area]=:text
 
 def text_area_show(object, attribute)
-  if object.send(attribute).blank?
-    link_to_inline_edit object, attribute, "<i class='fi-plus'></i>".html_safe, from_callee: __callee__
-  else
-    if defined? Ckeditor
-      link_to_inline_edit object,
-        attribute,
-        '<div class="ckeditor_area">'.html_safe +
-        cktext_area_tag(
-        attribute,
-        object[attribute],
-        :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
-        :ckeditor => {  :width => '100%',
-                        :height => '200px',
-                        :toolbar => "None",
-                        :readOnly => "true",
-                        :resize_enabled => "false",
-                        :toolbarCanCollapse => "false"
-                      }
-      ) +
-        image_tag(  'inline_forms/glass_plate.gif',
-        :class => "glass_plate",
-        :title => '' ) +
-        "<script>delete CKEDITOR.instances['textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}']</script>".html_safe +
-        '</div>'.html_safe,
-        from_callee: __callee__
-    else
-      link_to_inline_edit object, attribute, object[attribute], from_callee: __callee__
-    end
-  end
+  rich_text_show(object, attribute)
 end
 
 def text_area_edit(object, attribute)
-  if defined? Ckeditor
-    cktext_area_tag(
-      attribute,
-      object[attribute],
-      :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
-      :ckeditor => {  :width => '100%',
-                      :height => '200px'
-                    }
-    )  +
-    "<script>delete CKEDITOR.instances['textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}']</script>".html_safe
-  else
-    text_area_tag attribute, object[attribute], :class => 'attribute_text_area'
-  end
+  rich_text_edit(object, attribute)
 end
 
 def text_area_update(object, attribute)
-  object[attribute.to_sym] = params[attribute.to_sym]
+  rich_text_update(object, attribute)
 end
 
 def text_area_info(object, attribute)
-  object[attribute]
+  rich_text_info(object, attribute)
 end

data/app/helpers/form_elements/text_area_without_ckeditor.rb

@@ -1,18 +1,19 @@
 # -*- encoding : utf-8 -*-
+# Legacy alias for plain :text_area (CKEditor removed).
 InlineForms::SPECIAL_COLUMN_TYPES[:text_area_without_ckeditor]=:text
 
 def text_area_without_ckeditor_show(object, attribute)
-  link_to_inline_edit object, attribute, (object[attribute].nil? || object[attribute].empty?) ? "<i class='fi-plus'></i>".html_safe : object[attribute], from_callee: __callee__
+  plain_text_show(object, attribute)
 end
 
 def text_area_without_ckeditor_edit(object, attribute)
-  text_area_tag attribute, object[attribute], :class => 'attribute_text_area'
+  plain_text_edit(object, attribute)
 end
 
 def text_area_without_ckeditor_update(object, attribute)
-  object[attribute.to_sym] = params[attribute.to_sym]
+  plain_text_update(object, attribute)
 end
 
 def text_area_without_ckeditor_info(object, attribute)
-  object[attribute]
+  plain_text_info(object, attribute)
 end

data/app/helpers/form_elements/text_field.rb

@@ -1,8 +1,8 @@
 # -*- encoding : utf-8 -*-
 InlineForms::SPECIAL_COLUMN_TYPES[:text_field]=:string
 
-def text_field_show(object, attribute)
-  link_to_inline_edit object, attribute, object[attribute].blank? ? "<i class='fi-plus'></i>".html_safe : object[attribute], from_callee: __callee__
+def text_field_show(object, attribute, turbo_frame: false)
+  link_to_inline_edit object, attribute, object[attribute].blank? ? "<i class='fi-plus'></i>".html_safe : object[attribute], from_callee: __callee__, turbo_frame: turbo_frame
 end
 
 def text_field_edit(object, attribute)