inline_forms 7.2.11 → 7.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc1f19aa65a4c6d91b8a566e42e1a397257de689d2bf0f47ea8b68ce7a27e597
-  data.tar.gz: 15ed1d356f42fca6087414b60a292bb2fffa5fb87d1f55f2bfbec0cf78408ad8
+  metadata.gz: bbf211e9092af732b645bf10e9f9c338ced10c55e3ebf0a533146537669d1a4d
+  data.tar.gz: 90bc8cf55083ca23bbc1d3122a49e835620bf2e4800c8c83a93b871230d54718
 SHA512:
-  metadata.gz: 2f7badd154eccacf2c727f2ed13624da92352fee6056a12f8bf8d5f43287283d3270208b82200eb7f4c2b68b0356b0bc11583718e0fdc754e96c43520580a494
-  data.tar.gz: 444994d5d929591ba1f2e1cd8697edbd078e945e48772ab574b5797e4c0cd64cea1e9db69644dc58803a385750d085d140bee45611727f45b3f12bd8e9d81b33
+  metadata.gz: 5f66995db3089c59e1654f92f1a7c78b9701ccad3ea0a12fb4cf7729ea5ed1bff70003847af80ebcae6347c05e29f7e6fc9e8a9317252ea120a7a09d790c2284
+  data.tar.gz: 2e04d9869aff6e13a1eb6556e9865e640725dee6d9ad5a56887ed23f125bd9378ab679c773fd84cbc72b8df408335dd7026998e113254366e4cc358155c70785

data/CHANGELOG.md

@@ -4,6 +4,182 @@ All notable changes to this project are documented in this file.
 
 ## [Unreleased]
 
+## [7.5.2] - 2026-05-16
+
+### Fixed
+
+- **Field re-edit after Turbo update / cancel (Photo image, name, etc.):** `render_turbo_field` now sets **`@inline_forms_turbo_field = true`**, so the link inside the swapped **`<turbo-frame id="photo_<id>_image">`** carries **`data-turbo`** instead of legacy **`data-remote`**. 7.5.1 set the flag only in `_show.html.erb` (the row open template); the bare `field_show` re-render after a field cancel/update lost it, the link fell back to **`remote: true`**, jquery_ujs intercepted as a JS request the controller does not register, and the second click silently failed (no swap, no edit form).
+- **Top-level `+ new` flow (e.g. /apartments):** `link_to_new_record` falls back to **UJS (`remote: true`)** when called without a `parent_class`. The top-level list root stays a **`<div id="apartments_list">`** (a `<turbo-frame>` there collapses inside `position: absolute` `#outer_container` and hides rows under the fixed top bar), so a Turbo target on the **`+`** link is invalid -- 7.5.1 emitted `data-turbo-frame="apartments_list"`, which made cancel/create produce Turbo's "Content missing" or fall back to a full-page navigation. UJS (`new.js.erb` / `list.js.erb`) swap **`#apartments_list`** in place; nested has_many lists keep the Turbo contract unchanged.
+
+### Added
+
+- **Defensive CSS:** `turbo-frame { display: block; }` so any `<turbo-frame>` inside `#outer_container` (custom elements default to `display: inline`) does not collapse and hide its row content.
+- **Regression tests:**
+  - `example_app_apartment_top_level_new_test.rb` -- top-level list root stays `<div>`, **`+`** link is UJS, `new` / `cancel` / `create` go through `format.js` and swap **`#apartments_list`**.
+  - `example_app_apartment_photos_pagination_test.rb` -- after Turbo update / cancel of a Photo image field, `field_show` carries `data-turbo="true"` (not `data-remote="true"`).
+
+### Verified
+
+- **`bundle exec rails test`** -- **60 runs, 302 assertions, 0 failures**.
+- **curl:** field show after cancel/update emits `data-turbo="true" data-turbo-frame="_self"` (no `data-remote`); top-level new returns `format.js` swap of `#apartments_list`.
+- **Browser:** top-level `+ new Apartment` form renders inline + cancel returns to list (no "Content missing"); nested Photo image edit can be reopened immediately after cancel and after replacement.
+
+## [7.5.1] - 2026-05-16
+
+### Fixed
+
+- **Nested associated `+` (New) on `not_accessible_through_html?` models (Photo):** `new` now serves **`format.html`** when `parent_class` and `update` are present (was **406** / empty frame for Photo).
+- **New / Cancel / OK after New:** associated-list frame responses use the **`inline_forms`** layout (styled) instead of bare **`turbo_rails/frame`**; **`create`** restores the list with **`@ul_needed = true`** so the inner **`…_photos_list`** `<turbo-frame>` matches **`_show`** (fixes Turbo **“Content missing”** on cancel and create).
+- **`_new.html.erb`:** Turbo form sets **`data-turbo-frame`** to the parent list frame id.
+
+### Verified
+
+- **`bundle exec rails test`** — **53 runs, 260 assertions, 0 failures**; nested Photo new → cancel → create integration test.
+- **curl:** new **200** + stylesheet; cancel/create **200** with **`apartment_<id>_photos`** + **`…_photos_list`** frames.
+
+## [7.5.0] - 2026-05-16
+
+### Added
+
+- **Step 3 completion (UJS → Turbo row/field lifecycle):** row toolbar **`soft_delete` / `soft_restore` / `destroy` / `revert`** respond with **`format.html`** (`row_close`, `row_destroyed`) inside matching **`<turbo-frame>`**; helpers default to Turbo (`inline_forms_turbo_link_data`, `turbo_row:` on toolbar / versions / nested **`+`** links).
+- **Nested `+new` / `create` / versions panel:** `new_record`, `create_list_frame`, `versions_panel`, `versions_list_panel` HTML templates; associated/has_one/versions regions in **`_show`** wrapped in **`<turbo-frame>`**.
+- **`turbo:frame-load`** in **`inline_forms.js`:** re-init datepicker, timepicker, and Trix after frame swaps.
+- **Regression tests:** row destroy/revert Turbo, versions panel Turbo (`example_app_apartment_row_turbo_test.rb`, `example_app_apartment_versions_turbo_test.rb`).
+
+### Removed
+
+- **`edit.js.erb`**, **`update.js.erb`**, **`show_element.js.erb`** — scalar field edit/update/cancel is Turbo HTML only.
+
+### Changed
+
+- **`docs/ujs-to-turbo.md`:** Step 3 checklist marked done except **`show.js.erb` / `close.js.erb` / …** retained for **`_tree.html.erb`** (Step 4).
+
+### Verified (end-to-end against the `--example` install)
+
+- **`bundle exec rails test`** — **52 runs, 236 assertions, 0 failures, 0 errors, 0 skips** against the generated MyApp.
+- **curl smoke:** versions panel **`GET /apartments/1/list_versions?update=apartment_1_versions`** with **`Turbo-Frame`** → **200** + matching **`<turbo-frame id="apartment_1_versions">`**.
+- **curl + browser** — row toolbar, versions, field edit, nested photos (same contract as 7.4.x).
+
+## [7.4.5] - 2026-05-15
+
+### Added
+
+- **Example app integration test** (`example_app_apartment_photos_pagination_test.rb`): nested Photo **`image`** field — Turbo **`Turbo-Frame`** GET edit (multipart form) and **multipart `PUT`** — asserts **200** HTML with matching **`<turbo-frame id="…_image">`** and no **`UnknownFormat`** / **406** (Step 3 multipart regression guard from the 7.2.0 nested-frame era).
+
+### Changed
+
+- **`docs/ujs-to-turbo.md`:** Step 3 checklist — “replace photo image (multipart) inside nested frame” marked done.
+
+### Verified (end-to-end against the `--example` install)
+
+- **`bundle exec rails test`** — **47 runs, 208 assertions, 0 failures, 0 errors, 0 skips** against the generated MyApp (Apartment + Photo).
+- **curl smoke** (authenticated **`Turbo-Frame`** GETs / **`POST` multipart** with **`_method=put`**): same contract as 7.4.4 plus nested Photo **`/photos/1/edit?attribute=image&form_element=image_field&update=apartment_1_photo_<id>_image`** and image replace **`POST /photos/1?...`** — **200** and matching **`<turbo-frame id="…_image">`** (Devise scope **`/auth/users/sign_in`**; cookie jar must be sent on the multipart step).
+- **Browser** (cursor-ide-browser MCP, dev server): already-signed-in session — open **Konferensha** row (URL stays **`/`**, gallery appears) — **Next page** (gallery shows page-2 filenames) — **`/apartments/name_list`** — edit name — **ok** (read-only link shows new value).
+
+## [7.4.4] - 2026-05-16
+
+### Fixed
+
+- **`inline_forms create … --example` against a Rails 8 system gem:** `bin/inline_forms` now prefers a locally installed Rails **`~> 7.0`** (`rails _7.0.X_ new …`) when one is present, so the generated **`config/application.rb`** matches the **`rails ~> 7.0.0`** pin the installer writes into the **`Gemfile`**. Without this, a system **`rails 8.x`** wrote **`config.load_defaults 8.0`** and **`config.autoload_lib(ignore: …)`** into `application.rb`, both rejected by Rails 7.0 (`rails aborted! Unknown version "8.0"` and `NoMethodError: undefined method 'autoload_lib'` on the first **`bundle exec rails dartsass:install`**), so app generation aborted right after Dart Sass install.
+- **Defensive `application.rb` rewrite (belt + suspenders):** even when the picked generator is Rails 8.x (e.g. no 7.0 gem available), `bin/inline_forms_installer_core.rb` rewrites **`config.load_defaults <N>.<M>`** to **`config.load_defaults 7.0`** and strips **`config.autoload_lib(…)`** post-generation so the bundled Rails 7.0 can boot.
+
+### Changed
+
+- **`docs/ujs-to-turbo.md`:** Step 3 marks the apartment field flow integration test (**`example_app_apartment_field_turbo_test.rb`** — open row → edit text field → save → cancel) as done; the test has been shipping since 7.4.1.
+
+### Verified (end-to-end against the `--example` install)
+
+- **`bundle exec rails test`** — **46 runs, 196 assertions, 0 failures, 0 errors, 0 skips** against the generated MyApp (Apartment + Photo).
+- **curl smoke** with **`Turbo-Frame`** header: top-level row open/close (**`/apartments/1?update=apartment_1[&close=true]`**), scalar field edit/update/cancel (**`/apartments/1/edit?attribute=name&form_element=text_field&update=apartment_1_name`** + **`PUT /apartments/1`**), nested **`/photos?parent_class=Apartment&parent_id=1&update=apartment_1_photos_list`** pagination, and nested Photo row open/close (**`/photos/1?update=apartment_1_photo_1[&close=true]`**) all return **200** with the matching **`<turbo-frame id="…">`** in the body.
+- **Browser** (devtools MCP, Drive disabled, UJS for the legacy paths): sign-in → click apartment row (Turbo open, no full-page nav) → nested photo pagination Next (Turbo) → click name field (Turbo edit-in-place) → save (in-place swap, no reload) → close X (Turbo collapse, list shows updated name). **`/apartments/name_list`** field-edit demo confirmed reachable from the **More** menu.
+
+## [7.4.3] - 2026-05-16
+
+### Added
+
+- **Turbo row open/close on stock index:** each top-level list row is a **`<turbo-frame id="{model}_{id}">`**; presentation links use Turbo (**`row_show.html.erb`** / **`row_close.html.erb`**, **`close_link(..., turbo_row:)`**, **`example_app_apartment_row_turbo_test.rb`**).
+
+### Fixed
+
+- **Nested associated list (e.g. Apartment → Photo):** same per-row **`<turbo-frame>`** + Turbo presentation as top-level; removed **`data-turbo="false"`**, which broke nested **cancel** and other in-frame GETs. **`row_html_turbo_allowed?`** / **`nested_associated_list_row_update?`** serve **`format.html`** row **show** / **close** for **`not_accessible_through_html?`** models when **`params[:update]`** is a nested row id (e.g. **`apartment_1_photo_5`**).
+
+### Changed
+
+- **`docs/ujs-to-turbo.md`:** Step 2 / Step 3 checklist for row + nested Turbo.
+- **`example_app_apartment_photos_pagination_test.rb`:** asserts nested turbo-frame rows and Photo row open/close + field cancel; drops the obsolete requirement that nested rows opt out of Turbo.
+
+## [7.4.1] - 2026-05-15
+
+### Added
+
+- **Turbo field edit (Step 3, partial):** scalar fields in stock **`_show.html.erb`** are wrapped in **`<turbo-frame id="{model}_{id}_{attribute}">`**. Field **edit**, **update**, and **cancel** respond with **`format.html`** via **`field_edit.html.erb`** / **`field_show.html.erb`** and the **`turbo_rails/frame`** layout (no UJS on field links/forms). Row-level show/close remains UJS.
+- **`inline_forms_field_cancel_link`** helper and **`inline_forms_field_show`** helper; **`link_to_inline_edit`** accepts **`turbo_frame:`** and omits **`remote: true`** on the Turbo path.
+- **Regression tests** **`example_app_apartment_field_turbo_test.rb`** (stock panel field turbo-frame edit/update/cancel) and extended **`example_app_apartment_name_list_test.rb`** (turbo-frame contract, no **`UnknownFormat`** on cancel).
+
+### Fixed
+
+- **Field cancel on Turbo path:** cancel no longer triggers full-page navigation or **`UnknownFormat`** — **`format.html`** is always registered for single-attribute show; cancel uses a plain GET link with **`data-turbo-frame="_self"`** (no **`data-method`**, which conflicted with jQuery UJS).
+- **Cancel button height:** restored **`input[type=button]`** inside a thin wrapper link (Turbo/UJS attrs on the **`<a>`**) so cancel matches the **ok** submit height; Foundation **`a.button`** was rendering much taller in collapse rows.
+
+### Changed
+
+- **Example name list (`--example`):** uses the same turbo-field contract as stock **`_show`** ( **`@inline_forms_turbo_field`**, **`<turbo-frame>`** wrappers), not a separate UJS path.
+- **`docs/ujs-to-turbo.md`:** Step 3 field-level checklist items marked done for stock scalar fields and name-list regression.
+
+## [7.4.0] - 2026-05-15
+
+### Added
+
+- **`--example` demo: field-level inline edit without the stock `_show` UI** (`ApartmentsController#name_list`, **`GET /apartments/name_list`**). Lists the first 10 apartments with each **`name`** rendered via **`text_field_show`** inside a wrapper `id="apartment_<id>_name"`, so edit/update use the normal polymorphic paths without opening the full inline-edit panel. Installer copies **`app/views/apartments/name_list.html.erb`**, injects the controller action (with CanCan **`skip_load_and_authorize_resource`** / **`authorize! :read, Apartment`**), and adds the route.
+- **More menu link** in the example app only: installer overrides **`app/views/inline_forms/_header.html.erb`** with an extra item **“Apartment names (first 10)”** pointing at **`apartment_name_list_path`**.
+- **UJS → Turbo migration checklist** at **`docs/ujs-to-turbo.md`** (Steps 1–2 done, 3–5 tracked).
+- **Regression test** **`test/integration/example_app_apartment_name_list_test.rb`**: page render, More menu link, and UJS edit-link **`update=`** contract.
+
+## [7.3.4] - 2026-05-15
+
+### Changed
+
+- **Installer Gemfile**: `devise-i18n` is taken from RubyGems (`~> 1.16`, current release **1.16.0**) instead of the obsolete `https://github.com/acesuares/devise-i18n.git` fork (which matched upstream only through 2018). `devise` is pinned to **`~> 5.0`** so it satisfies `devise-i18n` 1.16’s runtime dependency on Devise 5+.
+
+## [7.3.3] - 2026-05-07
+
+### Fixed
+
+- **Session flash no longer appears inside inline-edit fields**: `_edit.html.erb` was injected into the field span via UJS and iterated the full `flash` hash, so an unconsumed Devise notice (for example after sign-in) could show up inside the Trix/rich-text editor when opening a field. The edit partial no longer renders global flash; `_new.html.erb` only shows `flash.now` keys used by `create` (`header`, `error`, `success`). **`layouts/inline_forms.html.erb`** now renders **`flash["notice"]` / `flash["alert"]`** under the header so redirect flash is shown once and consumed on normal pages.
+- **`InlineFormsApplicationController` default layout**: `layout 'devise' if :devise_controller?` was ineffective because `:devise_controller?` is a Symbol (always truthy), so every controller defaulted to `layouts/devise`. Replaced with `layout ->(c) { c.devise_controller? ? "devise" : "inline_forms" }` so app controllers use the full **`inline_forms`** chrome unless an action overrides `render` layout.
+- **Devise sign-in form** (`app/views/devise/sessions/_form.html.erb`): added `data-turbo="false"` on the form so a Turbo-enabled asset bundle cannot turn the POST into a non-navigational request (which would skip Devise’s `set_flash_message!` for `:signed_in`).
+
+## [7.3.2] - 2026-05-07
+
+### Fixed
+
+- **Legacy `:text_area` alias no longer triggers plain-text column checks**: `:text_area` is treated as the rich-text alias path, while plain-text column enforcement remains limited to `:plain_text`, `:plain_text_area`, and `:text_area_without_ckeditor`. This prevents false `InlineForms::PlainTextColumnMissingError` when switching an ActionText-backed attribute from `:rich_text` to `:text_area`.
+
+## [7.3.1] - 2026-05-07
+
+### Changed
+
+- **Long text form element naming is now explicit**: `:plain_text` is the canonical non-WYSIWYG textarea form element (backed by a DB `text` column), while `:rich_text` remains the ActionText/Trix element.
+- **Default mapping for migration type `:text` now emits form element `:plain_text`** (instead of `:text_area`) so newly generated models use the explicit name.
+- **Legacy aliases remain supported**: `:text_area_without_ckeditor` and `:plain_text_area` delegate to `:plain_text`; legacy `:text_area` and `:ckeditor` delegate to `:rich_text`.
+
+### Fixed
+
+- **Misconfigured `plain_text` attributes now fail fast with a clear error**: inline_forms now raises `InlineForms::PlainTextColumnMissingError` when a `plain_text`-style form element targets an attribute without a DB column (for example, an ActionText-only attribute such as `description` after switching from `:rich_text` to `:text_area`/`:plain_text` without adding a column).
+- **Checks run both during app boot/reload (for loaded models) and at request runtime** (`getKlass`, `create`, `update`) to prevent late `ActiveModel::MissingAttributeError` failures.
+- **Generated example-app tests now cover rich_text/plain_text edge cases**, including the failure path above and the reverse direction (`plain_text` -> `rich_text`) staying non-failing from inline_forms' perspective.
+
+## [7.3.0] - 2026-05-07
+
+### Removed
+
+- **CKEditor**: no CDN script tags in engine layouts, no `cktext_area_tag` / `CKEDITOR` usage, no `.ckeditor_area` styles, and no `inline_forms/ckeditor/config.js` asset precompile entry. Long text uses the same plain `<textarea>` path as before when the CKEditor gem was absent.
+
+### Changed
+
+- **`:text_area`** always renders a plain multiline field (equivalent to the old non-CKEditor path and to **`:text_area_without_ckeditor`**).
+- **`:ckeditor`** remains a valid generator/model type name but now delegates to **`:text_area`** behavior (plain text); migrate to **`:text_area`** or **`:rich_text`** when convenient.
+
 ## [7.2.11] - 2026-05-07
 
 ### Changed

data/README.rdoc

@@ -30,9 +30,9 @@ You can install the example application manually if you like:
 
  inline_forms create MyApp
  cd MyApp
- rails g inline_forms Picture name:string caption:string image:image_field description:text apartment:belongs_to _presentation:'#{name}'
+ rails g inline_forms Picture name:string caption:string image:image_field description:plain_text apartment:belongs_to _presentation:'#{name}'
  rails generate uploader Image
- rails g inline_forms Apartment name:string title:string description:text pictures:has_many pictures:associated _enabled:yes _presentation:'#{name}'
+ rails g inline_forms Apartment name:string title:string description:rich_text pictures:has_many pictures:associated _enabled:yes _presentation:'#{name}'
  bundle exec rake db:migrate
  rails s
 
@@ -48,6 +48,8 @@ The +:image_field+ form element uses CarrierWave. Generated apps depend on +carr
 
 To switch to S3, add +carrierwave-aws+ (or use the bundled fog backend) and configure a +CarrierWave.configure+ block in +config/initializers/carrierwave.rb+; nothing in inline_forms hard-codes local storage.
 
+For long text fields, use +:plain_text+ for a plain textarea backed by a DB +text+ column, or +:rich_text+ for ActionText/Trix content. +:plain_text+ requires an actual column on the model table; if the column is missing, inline_forms now raises +InlineForms::PlainTextColumnMissingError+ during controller boot/runtime checks.
+
 Note: generated apps also depend on ActiveStorage transitively because the +:rich_text+ form element uses ActionText (+active_storage:install+ runs during +inline_forms create+). Image uploads still go through CarrierWave; ActiveStorage is only there to back ActionText embeds.
 
 = Build a vagrant virtualbox box for easier development

data/app/assets/javascripts/inline_forms/inline_forms.js

@@ -37,3 +37,26 @@ $(function(){ $(document).foundation(); });
       $(this).attr('title', '');
     });
   });
+
+// Re-bind jQuery UI widgets and Trix after Turbo Frame swaps (Step 3).
+document.addEventListener("turbo:frame-load", function(event) {
+  var root = event.target;
+  if (!root || !root.querySelectorAll) { return; }
+
+  $(root).find("input.datepicker").each(function() {
+    var $el = $(this);
+    if (!$el.hasClass("hasDatepicker")) { $el.datepicker(); }
+  });
+
+  $(root).find("input.timepicker").each(function() {
+    var $el = $(this);
+    if (!$el.data("timepicker")) { $el.timepicker(); }
+  });
+
+  $(root).find("trix-editor").each(function() {
+    if (window.Trix && this.editor) { return; }
+    if (window.Trix && typeof Trix.Editor === "function") {
+      new Trix.Editor(this);
+    }
+  });
+});

data/app/assets/stylesheets/inline_forms/inline_forms.scss

@@ -223,6 +223,14 @@ select:hover, select:focus {
   font-weight: bold;
   font-size: 110%;
 }
+// Custom elements default to `display: inline`, which collapses the row layout
+// of an empty/just-mounted top-level `<turbo-frame id="apartments_list">` and
+// hides its rows under the fixed top bar. Force block layout so frames behave
+// like the legacy `<div class="list_container">` and `<div class="row">` they
+// replaced (see app/views/inline_forms/_list.html.erb).
+turbo-frame {
+  display: block;
+}
 .list_container {
   .row {
     font-size: 1.2rem;
@@ -258,6 +266,30 @@ select:hover, select:focus {
   }
 }
 
+// Field edit cancel: outer <a> carries Turbo/UJS; inner input[type=button] matches ok height.
+.edit_form .row.collapse {
+  input[type="submit"].postfix.button,
+  a.inline_forms-field-cancel input[type="button"].postfix.button {
+    margin: 2px 0 !important;
+  }
+}
+
+.edit_form a.inline_forms-field-cancel {
+  display: inline-block;
+  padding: 0;
+  border: 0;
+  background: transparent;
+  line-height: 0;
+  vertical-align: top;
+  text-decoration: none;
+
+  input[type="button"] {
+    pointer-events: none;
+    cursor: pointer;
+    width: auto;
+  }
+}
+
 .object_presentation {
   background-color: #B94C32;
   color: white;
@@ -434,22 +466,6 @@ select:hover, select:focus {
   margin-bottom: 0.5em;
 }
 
-.ckeditor_area {
-    position: relative;
-}
-
-.ckeditor_area .glass_plate {
-    position: absolute;
-    top: -1px;
-    width: 98%;
-    height: 232px;
-    border: 0;
-}
-
-.ckeditor_area .cke_top, .ckeditor_area .cke_bottom, .ckeditor_area .cke_border {
-    display: none;
-}
-
 /* jQuery ui Slider 8 */
 .slider {
     width: 300px;

data/app/controllers/concerns/versions_concern.rb

@@ -11,11 +11,12 @@ module VersionsConcern
     close = params[:close] || false
     if close
       respond_to do |format|
+        format.html { render "inline_forms/versions_panel", layout: "turbo_rails/frame" }
         format.js { render :versions }
       end
     else
       respond_to do |format|
-        format.html { } unless @Klass.not_accessible_through_html?
+        format.html { render "inline_forms/versions_list_panel", layout: "turbo_rails/frame" }
         format.js { render :versions_list }
       end
     end

data/app/controllers/inline_forms_application_controller.rb

@@ -1,7 +1,11 @@
 # -*- encoding : utf-8 -*-
 class InlineFormsApplicationController < ActionController::Base
   protect_from_forgery
-  layout 'devise' if :devise_controller?
+  # `layout 'devise' if :devise_controller?` was wrong: `:devise_controller?` is a
+  # Symbol (always truthy), so every controller used the Devise layout. Use a
+  # callable so only Devise controllers get `layouts/devise`; everything else
+  # defaults to `layouts/inline_forms` (actions may still override via `render`).
+  layout ->(controller) { controller.devise_controller? ? "devise" : "inline_forms" }
 
   # limit available locales by setting this. Override in applicaton_controller.
   I18n.available_locales = [ :en, :nl, :pp ]

data/app/controllers/inline_forms_controller.rb

@@ -72,12 +72,17 @@ 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
+          else
+            render "inline_forms/_list", layout: "inline_forms"
+          end
+        end
       end
       format.js { render :list }
     end
@@ -98,7 +103,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.html { render_turbo_new } if associated_list_html_allowed? || !@Klass.not_accessible_through_html?
       format.js { }
     end
   end
@@ -111,8 +116,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,6 +127,7 @@ class InlineFormsController < ApplicationController
     @update_span = params[:update]
     attributes = @inline_forms_attribute_list || @object.inline_forms_attribute_list
     attributes.each do | attribute, name, form_element |
+      InlineForms.assert_plain_text_column!(object: @object, attribute: attribute, form_element: form_element)
       send("#{form_element.to_s}_update", @object, attribute) unless form_element == :tree || form_element == :associated || (cancan_enabled? && cannot?(:read, @object, attribute))
     end
     @parent_class = params[:parent_class]
@@ -145,14 +150,16 @@ class InlineFormsController < ApplicationController
       @objects = @objects.where(conditions).paginate(:page => params[:page])
       @object = nil
       respond_to do |format|
-        format.js { render :list}
+        format.html { render_associated_list_frame } if associated_list_html_allowed?
+        format.js { render :list }
       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 associated_list_html_allowed? || !@Klass.not_accessible_through_html?
+        format.js { render :new }
       end
     end
   end
@@ -164,11 +171,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 +202,16 @@ class InlineFormsController < ApplicationController
       respond_to do |format|
         @attributes = @object.inline_forms_attribute_list
         if close
+          format.html { render_row_turbo(:close) } if row_html_turbo_allowed?
           format.js { render :close }
         else
-          format.js { }
+          format.html { render_row_turbo(:show) } if row_html_turbo_allowed?
+          format.js { render :show }
         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,10 +220,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.html { render_row_turbo(:close) } if row_html_turbo_allowed?
       format.js { render :close }
     end
   end
@@ -224,10 +231,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.html { render_row_turbo(:close) } if row_html_turbo_allowed?
       format.js { render :close }
     end
   end
@@ -237,11 +243,10 @@ 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.html { render_row_turbo_destroyed } if row_html_turbo_allowed?
         format.js { render :record_destroyed }
       end
     end
@@ -251,14 +256,13 @@ class InlineFormsController < ApplicationController
   # Thanks Ryan Bates: http://railscasts.com/episodes/255-undo-with-paper-trail
   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)
+      @object = @version.reify
+      @object.save!
       authorize!(:revert, @object) if cancan_enabled?
       respond_to do |format|
-        format.html { } unless @Klass.not_accessible_through_html?
+        format.html { render_row_turbo(:close) } if row_html_turbo_allowed?
         format.js { render :close }
       end
     end
@@ -277,11 +281,103 @@ class InlineFormsController < ApplicationController
   end
 
   private
+
+  # 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 falls back to +remote: true+, which the
+  # legacy +jquery_ujs+ bundle intercepts as a JS request -- the controller only
+  # registers +format.html+, so the click silently fails (no swap, no edit form).
+  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 associated_list_html_allowed?
+    @parent_class.present? && params[:update].present?
+  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