rails_admin 3.0.0.beta2 → 3.0.0.rc3

data/app/views/rails_admin/main/history.html.erb

@@ -4,16 +4,18 @@
 <% sort = params[:sort] %>
 <% sort_reverse = params[:sort_reverse] %>
 <% path_method = params[:id] ? "history_show_path" : "history_index_path" %>
-<%= form_tag("", method: "get", class: "search pjax-form form-inline") do %>
-  <div class="well">
-    <div class="input-group">
-      <input class="input-small form-control input-small" name="query" placeholder="<%= t("admin.misc.filter") %>" type="search" value="<%= query %>"></input>
-      <span class="input-group-btn">
-        <button class="btn btn-primary" data-disable-with="<%= '<i class="fas fa-sync"></i> '.html_safe + t('admin.misc.refresh') %>" type="submit">
-          <i class="fas fa-sync"></i>
-          <%= t("admin.misc.refresh") %>
-        </button>
-      </span>
+<%= form_tag("", method: "get", class: "search form-inline") do %>
+  <div class="card mb-3 p-3 bg-light">
+    <div class="row">
+      <div class="col-sm-6">
+        <div class="input-group">
+          <input class="form-control" name="query" placeholder="<%= t("admin.misc.filter") %>" type="search" value="<%= query %>" />
+          <button class="btn btn-primary" data-disable-with="<%= '<i class="fas fa-sync"></i> ' + t('admin.misc.refresh') %>" type="submit">
+            <i class="fas fa-sync"></i>
+            <%= t("admin.misc.refresh") %>
+          </button>
+        </div>
+      </div>
     </div>
   </div>
 <% end %>
@@ -30,7 +32,7 @@
         <% selected = (sort == property_name) %>
         <% sort_direction = (sort_reverse ? "headerSortUp" : "headerSortDown" if selected) %>
         <% sort_location = send(path_method, params.except("sort_reverse").merge(model_name: @abstract_model.to_param, sort: property_name).merge(selected && sort_reverse != "true" ? {sort_reverse: "true"} : {})) %>
-        <th class="header pjax <%= column[:css_class] %> <%= sort_direction if selected %>" data-href="<%= sort_location %>">
+        <th class="header <%= column[:css_class] %> <%= sort_direction if selected %>">
           <%= column[:link_text] %>
         </th>
       <% end %>
@@ -52,7 +54,7 @@
             <% label = o.send(@abstract_model.config.object_label_method) %>
             <% if show_action = action(:show, @abstract_model, o) %>
               <td>
-                <%= link_to(label, url_for(action: show_action.action_name, model_name: @abstract_model.to_param, id: o.id), class: 'pjax') %>
+                <%= link_to(label, url_for(action: show_action.action_name, model_name: @abstract_model.to_param, id: o.id)) %>
               </td>
             <% else %>
               <td>
@@ -73,6 +75,6 @@
   </tbody>
 </table>
 <% unless params[:all] || !@history.respond_to?(:current_page) %>
-  <%= paginate(@history, theme: 'ra-twitter-bootstrap', remote: true) %>
-  <%= link_to(t("admin.misc.show_all"), send(path_method, params.merge(all: true)), class: "show-all btn pjax") unless (tc = @history.total_count) <= @history.size || tc > 100 %>
+  <%= paginate(@history, theme: 'ra-twitter-bootstrap') %>
+  <%= link_to(t("admin.misc.show_all"), send(path_method, params.merge(all: true)), class: "show-all btn btn-light") unless (tc = @history.total_count) <= @history.size || tc > 100 %>
 <% end %>

data/app/views/rails_admin/main/index.html.erb

@@ -1,6 +1,6 @@
 <%
   query = params[:query]
-  params = request.params.except(:authenticity_token, :action, :controller, :utf8, :bulk_export, :_pjax)
+  params = request.params.except(:authenticity_token, :action, :controller, :utf8, :bulk_export)
   params.delete(:query) if params[:query].blank?
   params.delete(:sort_reverse) unless params[:sort_reverse] == 'true'
   sort_reverse = params[:sort_reverse]
@@ -18,16 +18,13 @@
 %>
 
 <% content_for :contextual_tabs do %>
-  <% if checkboxes %>
-    <%= bulk_menu %>
-  <% end %>
   <% if filterable_fields.present? %>
-    <li class="dropdown" style="float:right">
-      <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+    <li class="nav-item dropdown">
+      <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#">
         <%= t('admin.misc.add_filter') %>
         <b class="caret"></b>
       </a>
-      <ul class="dropdown-menu" id="filters" style="left:auto; right:0;">
+      <ul class="dropdown-menu dropdown-menu-end" id="filters">
         <% filterable_fields.each do |field| %>
           <%
             field_options = case field.type
@@ -40,6 +37,7 @@
           <li>
             <a
               href="#"
+              class="dropdown-item"
               data-field-label="<%= field.label %>"
               data-field-name="<%= field.name %>"
               data-field-operator="<%= field.default_filter_operator %>"
@@ -47,7 +45,7 @@
               data-field-required="<%= field.required.to_s %>"
               data-field-type="<%= field.type %>"
               data-field-value=""
-              data-field-datetimepicker-format="<%= field.try(:momentjs_format) %>"
+              data-field-datetimepicker-options="<%= field.try(:datepicker_options).try(:to_json) %>"
             >
               <%= field.label %>
             </a>
@@ -56,6 +54,9 @@
       </ul>
     </li>
   <% end %>
+  <% if checkboxes %>
+    <%= bulk_menu %>
+  <% end %>
 <% end %>
 
 <style>
@@ -66,42 +67,44 @@
 </style>
 
 <div id="list">
-  <%= form_tag(index_path(params.except(*%w[page f query])), method: :get, class: "pjax-form form-inline") do %>
-    <div class="well">
-      <span data-options="<%= ordered_filter_options.to_json %>" id="filters_box"></span>
+  <%= form_tag(index_path(params.except(*%w[page f query])), method: :get) do %>
+    <div class="card mb-3 p-3 bg-light">
+      <div class="row" data-options="<%= ordered_filter_options.to_json %>" id="filters_box"></div>
       <hr class="filters_box" style="display:<%= ordered_filters.empty? ? 'none' : 'block' %>"/>
-      <div class="input-group">
-        <input class="form-control input-small" name="query" placeholder="<%= t("admin.misc.filter") %>" type="search" value="<%= query %>"></input>
-        <span class="input-group-btn">
-          <button class="btn btn-primary" data-disable-with="<%= '<i class="fas fa-sync"></i>' + t('admin.misc.refresh') %>" type="submit">
-            <i class="fas fa-sync"></i>
-            <%= t('admin.misc.refresh') %>
-          </button>
-          <button class="btn btn-info" id="remove_filter" title="<%= t('admin.misc.reset_filters') %>">
-            <i class="fas fa-times"></i>
-          </button>
-        </span>
+      <div class="row">
+        <div class="col-sm-6">
+          <div class="input-group">
+            <input class="form-control" name="query" placeholder="<%= t("admin.misc.filter") %>" type="search" value="<%= query %>" />
+            <button class="btn btn-primary" data-disable-with="<%= '<i class="fas fa-sync"></i>' + t('admin.misc.refresh') %>" type="submit">
+              <i class="fas fa-sync"></i>
+              <%= t('admin.misc.refresh') %>
+            </button>
+            <button class="btn btn-info" id="remove_filter" title="<%= t('admin.misc.reset_filters') %>">
+              <i class="fas fa-times"></i>
+            </button>
+          </div>
+        </div>
+        <div class="col-sm-6 text-end">
+          <% if export_action %>
+            <%= link_to wording_for(:link, export_action), export_path(params.except('page')), class: 'btn btn-info' %>
+          <% end %>
+        </div>
       </div>
-      <% if export_action %>
-        <span style="float:right">
-          <%= link_to wording_for(:link, export_action), export_path(params.except('page')), class: 'btn btn-info' %>
-        </span>
-      <% end %>
     </div>
   <% end %>
   <% unless @model_config.list.scopes.empty? %>
     <ul class="nav nav-tabs" id="scope_selector">
       <% @model_config.list.scopes.each_with_index do |scope, index| %>
         <% scope = '_all' if scope.nil? %>
-        <li class="<%= 'active' if scope.to_s == params[:scope] || (params[:scope].blank? && index == 0) %>">
-          <a class="pjax" href="<%= index_path(params.merge(scope: scope, page: nil)) %>">
+        <li class="nav-item">
+          <a href="<%= index_path(params.merge(scope: scope, page: nil)) %>" class="nav-link <%= 'active' if scope.to_s == params[:scope] || (params[:scope].blank? && index == 0) %>">
             <%= I18n.t("admin.scopes.#{@abstract_model.to_param}.#{scope}", default: I18n.t("admin.scopes.#{scope}", default: scope.to_s.titleize)) %>
           </a>
         </li>
       <% end %>
     </ul>
   <% end %>
-  <%= form_tag bulk_action_path(model_name: @abstract_model.to_param), method: :post, id: "bulk_form", class: ["form"] do %>
+  <%= form_tag bulk_action_path(model_name: @abstract_model.to_param), method: :post, id: "bulk_form", class: ["form", "mb-3"] do %>
     <%= hidden_field_tag :bulk_action %>
     <% if description.present? %>
       <p>
@@ -116,7 +119,7 @@
           <tr>
             <% if checkboxes %>
               <th class="shrink sticky">
-                <input class="toggle" type="checkbox"></input>
+                <input class="toggle" type="checkbox" />
               </th>
             <% end %>
             <% properties.each do |property| %>
@@ -125,7 +128,7 @@
                 <% sort_location = index_path params.except('sort_reverse').except('page').merge(sort: property.name).merge(selected && sort_reverse != "true" ? {sort_reverse: "true"} : {}) %>
                 <% sort_direction = (sort_reverse == 'true' ? "headerSortUp" : "headerSortDown" if selected) %>
               <% end %>
-              <th class="<%= [property.sortable && "header pjax", property.sortable && sort_direction, property.sticky? && 'sticky', property.css_class, property.type_css_class].compact.join(' ') %>" data-href="<%= property.sortable && sort_location %>" rel="tooltip" title="<%= property.hint %>">
+              <th class="<%= [property.sortable && "header", property.sortable && sort_direction, property.sticky? && 'sticky', property.css_class, property.type_css_class].select(&:present?).join(' ') %>" data-href="<%= property.sortable && sort_location %>" rel="tooltip" title="<%= property.hint %>">
                 <%= property.label %>
               </th>
             <% end %>
@@ -142,7 +145,7 @@
               <% end %>
               <% properties.map{ |property| property.bind(:object, object) }.each do |property| %>
                 <% value = property.pretty_value %>
-                <td class="<%= [property.sticky? && 'sticky', property.css_class, property.type_css_class].compact.join(' ') %>" title="<%= strip_tags(value.to_s) %>">
+                <td class="<%= [property.sticky? && 'sticky', property.css_class, property.type_css_class].select(&:present?).join(' ') %>" title="<%= strip_tags(value.to_s) %>">
                   <%= value %>
                 </td>
               <% end %>
@@ -166,19 +169,19 @@
     <% if @model_config.list.limited_pagination %>
       <div class="row">
         <div class="col-md-6">
-          <%= paginate(@objects, theme: 'ra-twitter-bootstrap/without_count', total_pages: Float::INFINITY, remote: true) %>
+          <%= paginate(@objects, theme: 'ra-twitter-bootstrap/without_count', total_pages: Float::INFINITY) %>
         </div>
       </div>
     <% elsif @objects.respond_to?(:total_count) %>
       <% total_count = @objects.total_count.to_i %>
       <div class="row">
         <div class="col-md-6">
-          <%= paginate(@objects, theme: 'ra-twitter-bootstrap', remote: true) %>
+          <%= paginate(@objects, theme: 'ra-twitter-bootstrap') %>
         </div>
       </div>
       <div class="row">
         <div class="col-md-6">
-          <%= link_to(t("admin.misc.show_all"), index_path(params.merge(all: true)), class: "show-all btn btn-default clearfix pjax") unless total_count > 100 || total_count <= @objects.to_a.size %>
+          <%= link_to(t("admin.misc.show_all"), index_path(params.merge(all: true)), class: "show-all btn btn-light clearfix") unless total_count > 100 || total_count <= @objects.to_a.size %>
         </div>
       </div>
       <div class="clearfix total-count">

data/app/views/rails_admin/main/new.html.erb

@@ -1,3 +1,3 @@
-<%= rails_admin_form_for @object, url: new_path(model_name: @abstract_model.to_param), as: @abstract_model.param_key, html: { multipart: true, class: "form-horizontal denser", data: { title: @page_name } } do |form| %>
+<%= rails_admin_form_for @object, url: new_path(model_name: @abstract_model.to_param), as: @abstract_model.param_key, html: { multipart: true, class: "main", data: { title: @page_name } } do |form| %>
   <%= form.generate action: :create %>
 <% end %>

data/config/locales/rails_admin.en.yml

@@ -21,7 +21,6 @@ en:
       too_many_objects: "Too many objects, use search box above"
       no_objects: "No objects found"
       clear: Clear
-    loading: "Loading..."
     toggle_navigation: Toggle navigation
     home:
       name: "Home"

data/lib/generators/rails_admin/install_generator.rb

@@ -8,12 +8,16 @@ module RailsAdmin
     include Generators::Utils::InstanceMethods
 
     argument :_namespace, type: :string, required: false, desc: 'RailsAdmin url namespace'
-    class_option :asset, type: :string, required: false, default: nil, desc: 'Asset delivery method [options: webpack, webpacker, sprockets]'
+    class_option :asset, type: :string, required: false, default: nil, desc: 'Asset delivery method [options: webpacker, sprockets]'
     desc 'RailsAdmin installation generator'
 
     def install
-      namespace = ask_for('Where do you want to mount rails_admin?', 'admin', _namespace)
-      route("mount RailsAdmin::Engine => '/#{namespace}', as: 'rails_admin'")
+      if File.read(File.join(destination_root, 'config/routes.rb')).include?('mount RailsAdmin::Engine')
+        display "Skipped route addition, since it's already there"
+      else
+        namespace = ask_for('Where do you want to mount rails_admin?', 'admin', _namespace)
+        route("mount RailsAdmin::Engine => '/#{namespace}', as: 'rails_admin'")
+      end
       if File.exist? File.join(destination_root, 'config/initializers/rails_admin.rb')
         insert_into_file 'config/initializers/rails_admin.rb', "  config.asset_source = :#{asset}\n", after: "RailsAdmin.config do |config|\n"
       else
@@ -35,9 +39,7 @@ module RailsAdmin
     def asset
       return options['asset'] if options['asset']
 
-      if Rails.root.join('webpack.config.js').exist?
-        'webpack'
-      elsif defined?(Webpacker)
+      if defined?(Webpacker)
         'webpacker'
       else
         'sprockets'
@@ -53,7 +55,6 @@ module RailsAdmin
       @scss_relative_dir = '../stylesheets/'
       template 'rails_admin.js.erb', 'app/javascript/packs/rails_admin.js'
       template 'rails_admin.scss', 'app/javascript/stylesheets/rails_admin.scss'
-      template 'environment.js', 'config/webpack/environment.js'
     end
 
     def configure_for_webpack

data/lib/generators/rails_admin/templates/webpack.config.js

@@ -24,9 +24,6 @@ module.exports = {
     new webpack.optimize.LimitChunkCountPlugin({
       maxChunks: 1
     }),
-    new webpack.ProvidePlugin({
-      jQuery: "jquery"
-    }),
     new MiniCssExtractPlugin(),
   ]
 }

data/lib/rails_admin/abstract_model.rb

@@ -19,7 +19,7 @@ module RailsAdmin
       def new(m)
         m = m.constantize unless m.is_a?(Class)
         (am = old_new(m)).model && am.adapter ? am : nil
-      rescue *([LoadError, NameError] + (defined?(ActiveRecord) ? ['ActiveRecord::NoDatabaseError'.constantize] : []))
+      rescue *([LoadError, NameError] + (defined?(ActiveRecord) ? ['ActiveRecord::NoDatabaseError'.constantize, 'ActiveRecord::ConnectionNotEstablished'.constantize] : []))
         puts "[RailsAdmin] Could not load model #{m}, assuming model is non existing. (#{$ERROR_INFO})" unless Rails.env.test?
         nil
       end
@@ -86,9 +86,8 @@ module RailsAdmin
       associations.each do |association|
         case association.type
         when :has_one
-          if child = object.send(association.name)
-            yield(association, [child])
-          end
+          child = object.send(association.name)
+          yield(association, [child]) if child
         when :has_many
           children = object.send(association.name)
           yield(association, Array.new(children))

data/lib/rails_admin/adapters/active_record/object_extension.rb

@@ -13,7 +13,7 @@ module RailsAdmin
                 end
 
                 def #{association.name}_id=(item_id)
-                  self.#{association.name} = #{association.klass}.find_by_id(item_id)
+                  self.#{association.name} = (#{association.klass}.find(item_id) rescue nil)
                 end
               RUBY
             end

data/lib/rails_admin/adapters/active_record/property.rb

@@ -42,7 +42,7 @@ module RailsAdmin
         end
 
         def read_only?
-          false
+          model.readonly_attributes.include? property.name.to_s
         end
 
       private

data/lib/rails_admin/adapters/active_record.rb

@@ -12,8 +12,9 @@ module RailsAdmin
         model.new(params).extend(ObjectExtension)
       end
 
-      def get(id)
-        return unless object = model.where(primary_key => id).first
+      def get(id, scope = scoped)
+        object = scope.where(primary_key => id).first
+        return unless object
 
         object.extend(ObjectExtension)
       end
@@ -80,7 +81,11 @@ module RailsAdmin
         when 'postgresql'
           ::ActiveRecord::Base.connection.select_one("SELECT ''::text AS str;").values.first.encoding
         when 'mysql2'
-          ::ActiveRecord::Base.connection.raw_connection.encoding
+          if RUBY_ENGINE == 'jruby'
+            ::ActiveRecord::Base.connection.select_one("SELECT '' AS str;").values.first.encoding
+          else
+            ::ActiveRecord::Base.connection.raw_connection.encoding
+          end
         when 'oracle_enhanced'
           ::ActiveRecord::Base.connection.select_one('SELECT dummy FROM DUAL').values.first.encoding
         else

data/lib/rails_admin/adapters/mongoid/property.rb

@@ -11,11 +11,11 @@ module RailsAdmin
         end
 
         def name
-          property.name.to_sym
+          (property.options[:as] || property.name).to_sym
         end
 
         def pretty_name
-          property.name.to_s.tr('_', ' ').capitalize
+          (property.options[:as] || property.name).to_s.tr('_', ' ').capitalize
         end
 
         def type
@@ -64,7 +64,7 @@ module RailsAdmin
         end
 
         def read_only?
-          false
+          model.readonly_attributes.include? property.name.to_s
         end
 
       private

data/lib/rails_admin/adapters/mongoid.rb

@@ -18,8 +18,8 @@ module RailsAdmin
         model.new(params).extend(ObjectExtension)
       end
 
-      def get(id)
-        object = model.find(id)
+      def get(id, scope = scoped)
+        object = scope.find(id)
         return nil unless object
 
         object.extend(ObjectExtension)
@@ -52,10 +52,10 @@ module RailsAdmin
         scope
       rescue NoMethodError => e
         if /page/.match?(e.message)
-          e = e.exception <<-EOM.gsub(/^\s{12}/, '')
+          e = e.exception <<-ERROR.gsub(/^\s{12}/, '')
             #{e.message}
             If you don't have kaminari-mongoid installed, add `gem 'kaminari-mongoid'` to your Gemfile.
-          EOM
+          ERROR
         end
         raise e
       end

data/lib/rails_admin/config/actions/base.rb

@@ -49,7 +49,7 @@ module RailsAdmin
             (only.nil? || [only].flatten.collect(&:to_s).include?(bindings[:abstract_model].to_s)) &&
             ![except].flatten.collect(&:to_s).include?(bindings[:abstract_model].to_s) &&
             !bindings[:abstract_model].config.excluded?
-          )
+          ) && (!respond_to?(:writable?) || writable?)
         end
 
         register_instance_option :authorized? do
@@ -73,11 +73,6 @@ module RailsAdmin
           false
         end
 
-        # Render via pjax?
-        register_instance_option :pjax? do
-          link_target.blank?
-        end
-
         # Target window [_self, _blank]
         register_instance_option :link_target do
           nil

data/lib/rails_admin/config/actions/dashboard.rb

@@ -18,21 +18,21 @@ module RailsAdmin
 
         register_instance_option :controller do
           proc do
-            @history = @auditing_adapter&.latest(@action.auditing_versions_limit) || []
+            @history = @auditing_adapter&.latest(@action.auditing_versions_limit) if @action.history?
             if @action.statistics?
-              @abstract_models = RailsAdmin::Config.visible_models(controller: self).collect(&:abstract_model)
+              model_configs = RailsAdmin::Config.visible_models(controller: self)
 
+              @abstract_models = model_configs.map(&:abstract_model)
               @most_recent_created = {}
               @count = {}
               @max = 0
-              @abstract_models.each do |t|
-                scope = @authorization_adapter&.query(:index, t)
-                current_count = t.count({}, scope)
+              model_configs.each do |config|
+                scope = @authorization_adapter&.query(:index, config.abstract_model)
+                current_count = config.abstract_model.count({}, scope)
                 @max = current_count > @max ? current_count : @max
-                @count[t.model.name] = current_count
-                next unless t.properties.detect { |c| c.name == :created_at }
-
-                @most_recent_created[t.model.name] = t.model.last.try(:created_at)
+                name = config.abstract_model.model.name
+                @count[name] = current_count
+                @most_recent_created[name] = config.last_created_at
               end
             end
             render @action.template_name, status: @status_code || :ok
@@ -50,6 +50,10 @@ module RailsAdmin
         register_instance_option :statistics? do
           true
         end
+
+        register_instance_option :history? do
+          true
+        end
       end
     end
   end

data/lib/rails_admin/config/actions/delete.rb

@@ -46,6 +46,10 @@ module RailsAdmin
         register_instance_option :link_icon do
           'fas fa-times'
         end
+
+        register_instance_option :writable? do
+          !(bindings[:object] && bindings[:object].readonly?)
+        end
       end
     end
   end

data/lib/rails_admin/config/actions/edit.rb

@@ -44,6 +44,10 @@ module RailsAdmin
         register_instance_option :link_icon do
           'fas fa-pencil-alt'
         end
+
+        register_instance_option :writable? do
+          !(bindings[:object] && bindings[:object].readonly?)
+        end
       end
     end
   end

data/lib/rails_admin/config/actions/export.rb

@@ -14,7 +14,8 @@ module RailsAdmin
 
         register_instance_option :controller do
           proc do
-            if format = params[:json] && :json || params[:csv] && :csv || params[:xml] && :xml
+            format = params[:json] && :json || params[:csv] && :csv || params[:xml] && :xml
+            if format
               request.format = format
               @schema = HashHelper.symbolize(params[:schema].slice(:except, :include, :methods, :only).permit!.to_h) if params[:schema] # to_json and to_xml expect symbols for keys AND values.
               @objects = list_entries(@model_config, :export)

data/lib/rails_admin/config/actions/index.rb

@@ -20,7 +20,8 @@ module RailsAdmin
 
         register_instance_option :breadcrumb_parent do
           parent_model = bindings[:abstract_model].try(:config).try(:parent)
-          if am = parent_model && RailsAdmin.config(parent_model).try(:abstract_model)
+          am = parent_model && RailsAdmin.config(parent_model).try(:abstract_model)
+          if am
             [:index, am]
           else
             [:dashboard]

data/lib/rails_admin/config/actions/new.rb

@@ -17,10 +17,12 @@ module RailsAdmin
             if request.get? # NEW
 
               @object = @abstract_model.new
+              @action = @action.with(@action.bindings.merge(object: @object))
               @authorization_adapter&.attributes_for(:new, @abstract_model)&.each do |name, value|
                 @object.send("#{name}=", value)
               end
-              if object_params = params[@abstract_model.param_key]
+              object_params = params[@abstract_model.param_key]
+              if object_params
                 sanitize_params_for!(request.xhr? ? :modal : :create)
                 @object.assign_attributes(@object.attributes.merge(object_params.to_h))
               end
@@ -55,6 +57,10 @@ module RailsAdmin
         register_instance_option :link_icon do
           'fas fa-plus'
         end
+
+        register_instance_option :writable? do
+          !(bindings[:object] && bindings[:object].readonly?)
+        end
       end
     end
   end

data/lib/rails_admin/config/actions/show_in_app.rb

@@ -25,10 +25,6 @@ module RailsAdmin
         register_instance_option :link_icon do
           'fas fa-eye'
         end
-
-        register_instance_option :pjax? do
-          false
-        end
       end
     end
   end

data/lib/rails_admin/config/fields/association.rb

@@ -21,7 +21,7 @@ module RailsAdmin
             am = amc.abstract_model
             wording = associated.send(amc.object_label_method)
             can_see = !am.embedded? && (show_action = v.action(:show, am, associated))
-            can_see ? v.link_to(wording, v.url_for(action: show_action.action_name, model_name: am.to_param, id: associated.id), class: 'pjax') : ERB::Util.html_escape(wording)
+            can_see ? v.link_to(wording, v.url_for(action: show_action.action_name, model_name: am.to_param, id: associated.id)) : ERB::Util.html_escape(wording)
           end.to_sentence.html_safe.presence || '-'
         end
 
@@ -89,6 +89,11 @@ module RailsAdmin
           association.primary_key
         end
 
+        # Returns params which are to be set in modals
+        def associated_prepopulate_params
+          {}
+        end
+
         # Reader whether this is a polymorphic association
         def polymorphic?
           association.polymorphic?

data/lib/rails_admin/config/fields/base.rb

@@ -252,7 +252,7 @@ module RailsAdmin
         end
 
         def editable?
-          !(@properties && @properties.read_only?)
+          !((@properties && @properties.read_only?) || (bindings[:object] && bindings[:object].readonly?))
         end
 
         # Is this an association
@@ -301,14 +301,14 @@ module RailsAdmin
         def value
           bindings[:object].safe_send(name)
         rescue NoMethodError => e
-          raise e.exception <<-EOM.gsub(/^\s{10}/, '')
+          raise e.exception <<-ERROR.gsub(/^\s{10}/, '')
           #{e.message}
           If you want to use a RailsAdmin virtual field(= a field without corresponding instance method),
           you should declare 'formatted_value' in the field definition.
             field :#{name} do
               formatted_value{ bindings[:object].call_some_method }
             end
-          EOM
+          ERROR
         end
 
         # Reader for nested attributes

data/lib/rails_admin/config/fields/factories/active_storage.rb

@@ -16,7 +16,8 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
         ["#{name}_attachment".to_sym, "#{name}_blob".to_sym]
       end
     children_fields = associations.map do |child_name|
-      next unless child_association = parent.abstract_model.associations.detect { |p| p.name.to_sym == child_name }
+      child_association = parent.abstract_model.associations.detect { |p| p.name.to_sym == child_name }
+      next unless child_association
 
       child_field = fields.detect { |f| f.name == child_name } || RailsAdmin::Config::Fields.default_factory.call(parent, child_association, fields)
       child_field.hide unless field == child_field

data/lib/rails_admin/config/fields/factories/association.rb

@@ -3,7 +3,8 @@ require 'rails_admin/config/fields/types'
 require 'rails_admin/config/fields/types/belongs_to_association'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-  if association = parent.abstract_model.associations.detect { |a| a.foreign_key == properties.name && %i[belongs_to has_and_belongs_to_many].include?(a.type) }
+  association = parent.abstract_model.associations.detect { |a| a.foreign_key == properties.name && %i[belongs_to has_and_belongs_to_many].include?(a.type) }
+  if association
     field = RailsAdmin::Config::Fields::Types.load("#{association.polymorphic? ? :polymorphic : association.type}_association").new(parent, association.name, association)
     fields << field
 
@@ -15,9 +16,8 @@ RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
                            end.collect { |k| association.send(k) }.compact
 
     parent.abstract_model.properties.select { |p| possible_field_names.include? p.name }.each do |column|
-      unless child_field = fields.detect { |f| f.name.to_s == column.name.to_s }
-        child_field = RailsAdmin::Config::Fields.default_factory.call(parent, column, fields)
-      end
+      child_field = fields.detect { |f| f.name.to_s == column.name.to_s }
+      child_field ||= RailsAdmin::Config::Fields.default_factory.call(parent, column, fields)
       child_columns << child_field
     end