active_scaffold 3.6.0.pre → 3.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 089ef264fed67a42513f1317c4db56ccd736fdf9f57aeffcc469e9c672987c10
-  data.tar.gz: 7c2a738e0396d7644e873424e529543df14ea8336fbb26c6297670232dfa6903
+  metadata.gz: 6c9ea6700cdf564c8c6712df6f538251a00ab77d708a1cb6ddbaf1522f7f3c82
+  data.tar.gz: c71eb0579b0671fedf08104b51237f260b43ff5d6aa090c98a3ffffde943f31d
 SHA512:
-  metadata.gz: a23bf85f720e929a7da5ad87a92c6140ec584346f24a9d2a94db1a0bf82033cd556ec971ec2dfe50346cdb9d248e1b34c0675003c224a6a0ab29185008f4bb92
-  data.tar.gz: a72a0ad55518d03a44ae9f98cca0f9236369c55e5e2924673597712b0cadbddf9bea7a4424d9248215b32e51366845962469dce775ec7db7a903d6e73790037b
+  metadata.gz: dd0cb52f16d6a75545d491388cbde13f99db60cf0c951db73df00ce77dac5fdd09573331b510fcd2e9a2f637c539e754c8fab0838d5709e22fd8abb11128d9ae
+  data.tar.gz: b0b4558cf821b84701e42f730eb6699c49a82e3c1e70a6f570d6dd99abbb599f783dded394b94bd7aa96db89d4cd4a23e848480239d4256a5e3f596812ba4e17

data/{CHANGELOG → CHANGELOG.rdoc}

@@ -1,3 +1,39 @@
+= 3.6.0.rc1
+- Cleanup: deprecate ActiveScaffold.set_defaults for ActiveScaffold.defaults, rename some setters
+- Fix adding new action links on request with threadsafety enabled
+- Fix iterating in config.columns with threadsafety enabled
+- Fix changing pagination enabled/disabled with threadsafety enabled
+- Allow create action in has_many through singular association
+- Display no options in radio form_ui when no option is available, so column can be refreshed with update_columns
+- Add as_main_div_data to override data attributes on main div
+- Add loading indicator to embedded scaffolds, display error if fails
+- Fix race condition in threadsafe mode with delayed setup
+- Add ActiveScaffold::Config::Core.after_config_callbacks, so custom methods or procs can be added to be called after active_scaffold config block (used by bitfields bridge)
+- Display loading indicator at bottom on auto pagination
+- List rendering speed up
+- Remove font family from CSS, it was preventing from changing it easily in body
+- Fix search for mongoid models in with threadsafety enabled
+- Keep nested params after calling render_field for column in subform
+- Fix nested for controllers without list action (for example, for nested create on singular assocations)
+- Fix delayed setup issues with threads
+- Fix render_field under nested list for polymorphic association
+- Add foreign_type column to constrained columns in nested list for polymorphic association
+- Add return_to to action links on nested list for singular associations, so forms would return to list
+- Case insensitive search with PostGIS adapter
+- Use clear_storage with around_action and ensure, so empty hash is removed from session storage when exception is raised too
+- Delete search from session when search is reset
+- Add cache_column_counts method to get counts with one query for associations which are not preloaded, query per column is overridable with count_query_for_column
+- ActiveStorage support with bridge
+- Add list_row_attributes helper so more HTML attributes can be added to tr.record in list, overriding the helper
+- Support column!=value param for not equal condition (column!= means column is not null)
+- Don't force to use join for column's includes when sorting by method
+- Add support for range conditions in url params for numeric (integer, decimal, float, bigint) columns too
+- Support include_blank option in :radio form_ui
+- Add add_new option for :select form_ui in singular associations, in column.options, it adds link to toggle between select and subform
+- Fix subform crud in subform subgroup, when form is on nested scaffold, when record on first subform is persisted
+- Add association_join_text setting to column, so it can be changed for one column only
+- Use Arel.sql with sorting.clause before passing to reorder method
+
 = 3.6.0.pre
 - Added threadsafety as tech preview, enabled with ActiveScaffold.threadsafe! in initializer.
 - Added active_scaffold_config.build_action_columns method to easily create action columns for custom form actions.
@@ -16,6 +52,9 @@
 - Display flash messages only inside create form, when conf.list.always_show_create is enabled, instead of displaying twice (in form and above list).
 - Fix default autocomplete value for password form_ui, new-password has to be used because off is ignored by browsers in password fields now
 
+= 3.5.5
+- Fix creating new records, when using cancan and allowing access based on id (fixes #617)
+
 = 3.5.4
 - Fix chosen form_ui for plural associations
 - Eager load with includes in association options query, if includes has a hash with own association key, see #612

data/app/assets/javascripts/active_scaffold.js.erb

@@ -32,7 +32,6 @@
     require_asset "prototype/active_scaffold"
     require_asset "prototype/dhtml_history"
     require_asset "prototype/form_enhancements"
-    require_asset "prototype/rico_corner"
   end
 %>
 ActiveScaffold.config = <%= ActiveScaffold.js_config.to_json %>;

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -323,6 +323,23 @@ jQuery(document).ready(function($) {
     if (jQuery(this).prop('checked')) color_field.val('');
   });
 
+  jQuery(document).on('click', '.show-new-subform', function(e) {
+    e.preventDefault();
+    var $this = jQuery(this), line = $this.closest('.form-element'),
+      select = line.find('#' + $this.data('select-id')),
+      subform = line.find('#' + $this.data('subform-id'));
+    if (select.is(':visible')) {
+      select.hide().prop('disabled', true);
+      subform.show().find("input:disabled,select:disabled,textarea:disabled").prop('disabled', false);
+      $this.data('select-text', $this.html());
+      $this.html($this.data('subform-text'));
+    } else {
+      subform.hide().find("input:enabled,select:enabled,textarea:enabled").prop('disabled', true);
+      select.show().prop('disabled', false);
+      $this.html($this.data('select-text'));
+    }
+  });
+
   jQuery(document).on('turbolinks:before-visit', function() {
     if (history.state.active_scaffold) {
       history.replaceState({turbolinks: true, url: document.location.href}, '', document.location.href);
@@ -480,6 +497,7 @@ var ActiveScaffold = {
     ActiveScaffold.auto_paginate(container);
     ActiveScaffold.draggable_lists('.draggable-lists', container);
     ActiveScaffold.sliders(container);
+    ActiveScaffold.disable_optional_subforms(container);
   },
   setup_history_state: function() {
     var data = {}, current_search_item = jQuery('.active-scaffold .filtered-message[data-search]');
@@ -505,7 +523,9 @@ var ActiveScaffold = {
   auto_paginate: function(element) {
     var paginate_link = jQuery('.active-scaffold-pagination.auto-paginate a:first', element);
     if (paginate_link.length) {
-      jQuery('.active-scaffold-pagination.auto-paginate', element).hide();
+      var pagination = paginate_link.closest('.auto-paginate');
+      pagination.find('.as_paginate').hide();
+      pagination.find('.loading-indicator').css({visibility: 'visible'});
       ActiveScaffold.auto_load_page(paginate_link.attr('href'), {auto_pagination: true});
     }
   },
@@ -515,6 +535,11 @@ var ActiveScaffold = {
   enable_js_form_buttons: function(element) {
     jQuery('.as-js-button', element).show();
   },
+  disable_optional_subforms: function(element) {
+    jQuery('.form-element select + .sub-form').each(function() {
+      jQuery("input:enabled,select:enabled,textarea:enabled", this).prop('disabled', true);
+    });
+  },
   sliders: function(element) {
     jQuery('.as-slider', element).each(function() {
       var opts = $(this).data('slider');
@@ -525,8 +550,13 @@ var ActiveScaffold = {
   load_embedded: function(element) {
     jQuery('.active-scaffold-component .load-embedded', element).each(function(index, item) {
       item = jQuery(item);
-      item.closest('.active-scaffold-component').load(item.attr('href'), function() {
-        jQuery(this).trigger('as:element_updated');
+      var indicator = item.closest('.active-scaffold-component').find('.loading-indicator');
+      indicator.css({visibility: 'visible'});
+      item.closest('.active-scaffold-component').load(item.attr('href'), function(response, status, xhr) {
+        if (status == 'error') {
+          indicator.css({visibility: 'hidden'});
+          indicator.after($('<p>').html(item.data('error-msg')).addClass("error-message message server-error"));
+        } else jQuery(this).trigger('as:element_updated');
       });
     });
   },
@@ -679,7 +709,7 @@ var ActiveScaffold = {
 
   disable_form: function(as_form, skip_loading_indicator) {
     if (typeof(as_form) == 'string') as_form = '#' + as_form;
-    as_form = jQuery(as_form)
+    as_form = jQuery(as_form);
     var loading_indicator = jQuery('#' + as_form.attr('id').replace(/-form$/, '-loading-indicator'));
     if (!skip_loading_indicator && loading_indicator) loading_indicator.css('visibility','visible');
     jQuery('input[type=submit]', as_form).attr('disabled', 'disabled');
@@ -1049,6 +1079,7 @@ var ActiveScaffold = {
       url: url,
       data: params,
       type: 'post',
+      dataType: 'script',
       beforeSend: function(xhr, settings) {
         element.nextAll('img.loading-indicator').css('visibility','visible');
         /* force to blur and save previous last_focus, because disable_form will trigger

data/app/assets/stylesheets/active_scaffold_colors.scss

@@ -278,7 +278,7 @@ color: $msg_filtered_color;
 color: $msg_color;
 }
 
-.active-scaffold .error-message {
+.active-scaffold .error-message, .active-scaffold-component .error-message {
 border-color: $msg_error_border_color;
 background-color: $msg_error_bg;
 }

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -58,13 +58,15 @@ position: relative;
 .active-scaffold-header h2 {
 padding: 2px 0px;
 margin: 0;
-font: bold 160% arial, sans-serif;
+font-weight: bold;
+font-size: 160%;
 }
 
 .active-scaffold div.actions a,
 .active-scaffold div.actions {
 float: right;
-font: bold 14px arial;
+font-weight: bold;
+font-size: 14px;
 letter-spacing: -1px;
 text-decoration: none;
 padding: 1px 2px;
@@ -150,7 +152,8 @@ text-align: left;
 .active-scaffold th a,
 .active-scaffold th p,
 .active-scaffold .show-view th {
-font: bold 11px arial, sans-serif;
+font-weight: bold;
+font-size: 11px;
 }
 .active-scaffold th a,
 .active-scaffold th p {
@@ -192,7 +195,6 @@ display: none;
 padding: 5px 4px;
 }
 .active-scaffold tr.record td {
-font-family: Verdana, sans-serif;
 font-size: 11px;
 border: solid 1px;
 border-width: 0 0 1px 1px;
@@ -251,7 +253,8 @@ padding: 0 2px;
 
 .active-scaffold tr.record td.actions a,
 .active-scaffold tr.record td.actions div {
-font: bold 11px verdana, sans-serif;
+font-weight: bold;
+font-size: 11px;
 letter-spacing: -1px;
 padding: 2px;
 margin: 0 2px;
@@ -378,7 +381,8 @@ right: 0px;
 
 .active-scaffold .active-scaffold .active-scaffold-header div.actions a,
 .active-scaffold .active-scaffold .active-scaffold-header div.actions div {
-font: bold 11px verdana, sans-serif;
+font-weight: bold;
+font-size: 11px;
 }
 
 .active-scaffold .active-scaffold .view {
@@ -413,13 +417,15 @@ font-size: 11px;
 
 .active-scaffold-calculations td {
 border-top: 2px solid;
-font: bold 12px arial, sans-serif;
+font-weight: bold;
+font-size: 12px;
 }
 
 .active-scaffold .active-scaffold-footer {
 padding: 3px 0px 2px 0px;
 border-bottom: none;
-font: bold 12px arial, sans-serif;
+font-weight: bold;
+font-size: 12px;
 }
 .active-scaffold .active-scaffold-footer > br {
 clear: both;
@@ -430,13 +436,17 @@ float: right;
 white-space: nowrap;
 margin-right: 5px;
 }
+.active-scaffold-footer .active-scaffold-pagination.auto-paginate {
+float: left;
+}
 
 .active-scaffold-footer a {
 text-decoration: none;
 letter-spacing: 0;
 padding: 0 2px;
 margin: 0 -2px;
-font: bold 12px arial, sans-serif;
+font-weight: bold;
+font-size: 12px;
 }
 
 .active-scaffold-footer .next {
@@ -467,7 +477,7 @@ text-align: center;
 position: relative;
 }
 
-.active-scaffold .message {
+.active-scaffold .message, .active-scaffold-component .message {
 font-size: 11px;
 font-weight: bold;
 padding: 5px 20px 5px 5px;
@@ -493,15 +503,16 @@ position: absolute;
 right: 10px;
 top: 4px;
 padding: 0;
-font: bold 11px verdana, sans-serif;
+font-weight: bold;
+font-size: 11px;
 letter-spacing: -1px;
 }
 
-.active-scaffold .messages-container .message {
+.active-scaffold .messages-container .message, .active-scaffold-component .message {
 margin: 0;
 }
 
-.active-scaffold .error-message {
+.active-scaffold .error-message, .active-scaffold-component .error-message {
 border-left: solid 5px;
 }
 
@@ -529,7 +540,6 @@ padding: 2px 5px;
 font-size: 11px;
 margin: 0;
 letter-spacing: 0;
-font-family: Verdana;
 }
 
 .active-scaffold .errorExplanation ul {
@@ -541,12 +551,12 @@ list-style: disc;
 .active-scaffold .errorExplanation p {
 font-size: 11px;
 padding: 2px 5px;
-font-family: Verdana;
 margin: 0;
 }
 
 .active-scaffold .errorExplanation ul li {
-font: bold 11px verdana;
+font-weight: bold;
+font-size: 11px;
 letter-spacing: -1px;
 margin: 0;
 padding: 0;
@@ -590,13 +600,15 @@ clear: both;
 width: 12em;
 float: left;
 clear: left;
-font: normal 11px verdana, sans-serif;
+font-weight: normal;
+font-size: 11px;
 line-height: 16px;
 }
 
 .active-scaffold .show-view dd {
 float: left;
-font: bold 14px arial;
+font-weight: bold;
+font-size: 14px;
 padding-left: 5px;
 margin-bottom: 5px;
 }
@@ -611,7 +623,6 @@ margin: 0;
 .active-scaffold .submit {
 font-weight: bold;
 font-size: 14px;
-font-family: Arial, sans-serif;
 letter-spacing: 0;
 margin: 0;
 margin-top: 5px;
@@ -631,7 +642,8 @@ padding: 2px;
 margin: 0;
 text-transform: none;
 letter-spacing: -1px;
-font: bold 16px arial;
+font-weight: bold;
+font-size: 16px;
 }
 
 .active-scaffold h5 {
@@ -663,7 +675,8 @@ clear: both;
 
 .active-scaffold a.as_cancel,
 .active-scaffold p.form-footer a {
-font: bold 14px arial, sans-serif;
+font-weight: bold;
+font-size: 14px;
 letter-spacing: 0;
 }
 
@@ -682,7 +695,8 @@ clear: both;
 }
 
 .active-scaffold label {
-font: normal 11px verdana, sans-serif;
+font-weight: normal;
+font-size: 11px;
 }
 
 .active-scaffold li.form-element dt {
@@ -717,12 +731,12 @@ font-weight: bold;
 
 .active-scaffold label.example {
 font-size: 11px;
-font-family: arial;
 }
 
 .active-scaffold input.text-input,
 .active-scaffold select {
-font: bold 16px arial;
+font-weight: bold;
+font-size: 16px;
 letter-spacing: -1px;
 border: solid 1px;
 }
@@ -746,7 +760,6 @@ padding: 1px;
 
 
 .active-scaffold textarea {
-font-family: Arial, sans-serif;
 font-size: 12px;
 padding: 1px;
 border: solid 1px;
@@ -828,6 +841,12 @@ clear: left;
 padding: 5px 0;
 padding-left: 5px;
 }
+.active-scaffold .form-element select + .sub-form {
+float: none;
+}
+.active-scaffold .form-element .show-new-subform {
+margin-left: 5px;
+}
 
 .active-scaffold .sub-form h5 {
 margin-left: -5px;
@@ -840,7 +859,8 @@ background: none;
 }
 
 .active-scaffold .sub-form table th {
-font: normal 10px verdana, sans-serif;
+font-weight: normal;
+font-size: 10px;
 padding: 0 5px 0 1px;
 background: none;
 }
@@ -891,13 +911,15 @@ display: none;
 }
 
 .active-scaffold .sub-form .association-record a {
-font: bold 12px arial;
+font-weight: bold;
+font-size: 12px;
 }
 
 .active-scaffold .sub-form input.text-input,
 .active-scaffold .sub-form select {
 letter-spacing: 0;
-font: bold 12px arial;
+font-weight: bold;
+font-size: 12px;
 }
 
 .active-scaffold .sub-form .footer-wrapper {
@@ -983,7 +1005,8 @@ padding: 4px 0px;
 
 .as_touch .active-scaffold div.actions a,
 .as_touch .active-scaffold div.actions div {
-  font: bold 14px arial;
+font-weight: bold;
+font-size: 14px;
 }
 
 .as_touch .active-scaffold div.actions {

data/app/views/active_scaffold_overrides/_list_header.html.erb

@@ -1,8 +1,6 @@
-<% action_links = active_scaffold_config.action_links.collection
-  unless action_links.empty? -%>
-  <div class="actions">
-    <%= display_action_links(action_links, nil, :skip_unauthorized => true) %>
-    <%= loading_indicator_tag(:action => :table) %>
-  </div>
-<% end %>
+<% action_links = active_scaffold_config.action_links.collection -%>
+<div class="actions">
+  <%= display_action_links(action_links, nil, :skip_unauthorized => true) unless action_links.empty? %>
+  <%= loading_indicator_tag(:action => :table) %>
+</div>
 <h2><%= active_scaffold_config.list.user.label %></h2>

data/app/views/active_scaffold_overrides/_list_record.html.erb

@@ -6,14 +6,13 @@ tr_class = "#{cycle("", "even-record")} #{list_row_class(record)}"
 action_links ||= active_scaffold_config.action_links.member
 data_refresh ||= record.to_param
 -%>
-<tr class="record <%= tr_class %>" id="<%= row_id %>" data-refresh="<%= data_refresh %>">
+<%= content_tag :tr, list_row_attributes(tr_class, row_id, data_refresh) do %>
   <% columns.each do |column| %>
     <% authorized = record.authorized_for?(:crud_type => :read, :column => column.name) -%>
     <% column_value = authorized ? get_column_value(record, column) : empty_field_text -%>
+    <% attrs = column_attributes(column, record).merge(:class => column_class(column, column_value, record)) %>
 
-    <%= content_tag :td, column_attributes(column, record).merge(:class => column_class(column, column_value, record)) do %>
-      <%= authorized ? render_list_column(column_value, column, record) : column_value %>
-    <% end %>
+    <%= content_tag :td, authorized ? render_list_column(column_value, column, record) : column_value, attrs %>
   <% end -%>
 
   <% unless grouped_search? -%>
@@ -26,4 +25,4 @@ data_refresh ||= record.to_param
     </tr>
   </table></td>
   <% end -%>
-</tr>
+<% end %>