active_scaffold 3.4.43 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c89a2575bfac755ce70fde2774b15e2a4ee4290
-  data.tar.gz: 47f69051b49d59a150b04c81c74d151452d1c629
+  metadata.gz: 0a7eb8fad2b071936f60422993e7edd163d60f7b
+  data.tar.gz: b2ed33ac963964127a633ec19547874e350d1c9d
 SHA512:
-  metadata.gz: b8ac30db93e48681891cea00067f401ac8327f7ec139c38d8e5cccebbb493a7e5bbc535a5c1536d0666c768e60032de15f604b7c98274e02df0716c2d49f8304
-  data.tar.gz: f0f0300ea76e0a5c78e8839d2d3a18eb47f99f076319988f187992c95f05c1a40e4b0e3e8dbe46ab9861a34c97c4dffbbf488959ca085289370a56fe30e283ca
+  metadata.gz: 81f8a0cb3b77d49ed1771b02993a02a470a8bbf697d54c27e70649661148b461b4155c89533728305e738ca1dfe227470709590f46e63a76cd7a8280214f4a3c
+  data.tar.gz: 3b6b906a0db4738963ff2bf63504928d2348cc42cbe1d9a3227b3d31d4deb7754fb64f5690b8da044fb408514cac196fb41d6fae93d94f144057126fccf55190

data/CHANGELOG

@@ -1,3 +1,42 @@
+= 3.5.0
+- add basic support for Mongoid
+- add support for associations between Mongoid and ActiveRecord with ActiveMongoid
+- use concerns for routes, deprecate as_routes method
+- add install generator
+- rails 5.0 support and turbolinks 5.0 support, without jquery.turbolinks
+- rename active_scaffold generator as active_scaffold:resource
+- rename active_scaffold_controller generator as active_scaffold:controller
+- remove deprecations from 3.4.x (active_scaffold_includes and using @record in helpers)
+- check create authorized for create on list (config.list.always_show_create)
+- allow to disable inplace_edit for column when update form is enabled
+- add support for aggregated lists to field_search (config.field_search.group_options)
+- add support for range conditions in url params for date and datetime columns
+- add :color form_ui with "No color" checkbox to disable if column may be null
+- add inline_links config to show action, display member links in show action loaded in page
+- add :telephone list_ui displaying formatted phone number with tel: link
+- add global config option to display reason for disabled action, authorized methods must return string with reason, and string is interpreted as not authorized
+- stop saving embedded scaffolds info into session, so no more CookieOverflow errors caused by loading many embedded scaffolds
+- add add_association_columns method to config.columns, so columns from has_one or belongs_to association can be added as delegated columns (for list, show, field_search and update_column only)
+- support has_many through singular associations (belongs_to or has_one) in forms
+- remove onsubmit tag in forms and move tinymce related JS to assets
+- use html5 history api when listing is refreshed
+- use date, datetime-local and time html5 inputs for date, datetime and time columns without form_ui
+- add month and week form_ui using html5 inputs
+- avoid browser mixes html and xhr cache for listing requests, using vary header
+- improve in_subform? check for subforms, so only reverse association is hidden (needed when subform class has multiple associations to main form's class)
+- fix select of existing record for nested subform
+- fix apply constraints to parent (fix update columns on subform on embedded scaffold)
+- fix for override form field and subform partials on AS controllers which are parent class for AS controllers, so they are shared by children classes
+- fix translation for ActiveRecord enums
+- fix do_refresh_list on actions with GET route, it used :id and :action from request for sorting and pagination links
+- fix enabling draggable lists and sliders on new subform records
+- fix updating column and changing from :hidden form_ui to different one
+- fix searching with :multi_chosen search_ui
+- fix human conditions for :chosen and :multi_chosen search_ui
+- fix display of association in list when association_limit is nil
+- fix conversion of i18n date and datetime value, some abbr day and month may be equal in some languages
+- fix hidden form_ui for collection associations (has_many, habtm)
+
 = 3.4.43
 - Fix human conditions for date and datetime columns, not using date picker
 

data/{LICENSE → LICENSE.md}

@@ -1,4 +1,4 @@
-Copyright © 2006—2016 Richard White, Sergio Cambra and contributors
+Copyright © 2006—2017 Richard White, Sergio Cambra and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -8,11 +8,13 @@ Overview
 [![Inline docs](https://inch-ci.org/github/activescaffold/active_scaffold.svg?branch=master)](https://inch-ci.org/github/activescaffold/active_scaffold)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
-ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control.  Rails 3.2 and 4.x are supported, ruby >= 1.9 required. For rails 4 is recommended >= 4.0.5.
+ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control.  Rails >= 4.0.5 is supported, ruby >= 2.1 supported, although it should work with ruby >= 2.0.0, it's too old and not tested. Ruby < 2.0.0 won't work.
 
 Branch Details
 --------------
-rails-3.2 branch on Github supports Rails 3.1 & 3.2, and is the current source of the 3.2.x line of gems. The master branch (3.3.x) has dropped support for Rails 3.1
+3-4-stable supports rails >= 3.2.x and ruby >= 1.9.3  
+3-3-stable supports rails >= 3.2.x and ruby >= 1.8  
+rails-3.2 supports Rails 3.1 & 3.2, and is the current source of the 3.2.x line of gems.
 
 Quick Start
 -----------
@@ -25,32 +27,26 @@ Added to Gemfile
 Run the following commands
 
     bundle install
+    rails g active_scaffold:install
     bundle exec rake db:create
-    rails g active_scaffold User name:string
+    rails g active_scaffold:resource User name:string
     bundle exec rake db:migrate
+    
+Commands for Rails 5
 
-Add the following line to app/assets/javascripts/application.js
-
-    //= require active_scaffold
-
-Add the following line to /app/assets/stylesheets/application.css
-
-    *= require active_scaffold
+    bundle install
+    rails g active_scaffold:install
+    rails db:create
+    rails g active_scaffold:resource User name:string
+    rails db:migrate
+    
 
-Run the app and visit localhost:3000/users 
+Run the app and visit localhost:3000/users
 
 Configuration
 -------------
 See Wiki for instructions on customising ActiveScaffold and to find the full API details.
 
-Compatibility Issues
---------------------
-jQuery 1.9 deprecates some methods that rails-3.2 branch still uses (NB: jQuery 1.9 is supported in 3.3.x, the master branch). You'll therefore need to ensure you use jQuery 1.8. You can do this by fixing version in your Gemfile:
-
-    gem 'jquery-rails', '2.1.4'
-
-active_scaffold_batch plugin gem (versions 3.2.x) require 3.3.x (master branch). Therefore if you wish to try using active_scaffold_batch with this branch, you'll need to fork the project and edit the runtime dependency in the gemspec file (use at your own discretion)
-
 Credits
 -------
 ActiveScaffold grew out of a project named Ajaxscaffold dating back to 2006. It has had numerous contributors including:
@@ -73,3 +69,15 @@ http://github.com/scambra/recordselect/
 License
 =======
 Released under the MIT license (included)
+
+---
+
+A ruby translation project managed on [Locale](http://www.localeapp.com/) that's open to all!
+
+## Contributing to active_scaffold
+
+- Edit the translations directly on the [active_scaffold](http://www.localeapp.com/projects/public?search=active_scaffold) project on Locale.
+- **That's it!**
+- The maintainer will then pull translations from the Locale project and push to Github.
+
+Happy translating!

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

@@ -7,7 +7,7 @@
       require_asset "jquery-ui"
     elsif Jquery.const_defined? 'Ui'
       jquery_ui_prefix = Jquery::Ui::Rails::VERSION < '5.0.0' ? 'jquery.ui.' : 'jquery-ui/'
-      jquery_ui_widgets_prefix = Jquery::Ui::Rails::VERSION >= '6.0.0' ? '/widgets/' : ''
+      jquery_ui_widgets_prefix = Jquery::Ui::Rails::VERSION >= '6.0.0' ? 'widgets/' : ''
       require_asset "#{jquery_ui_prefix}core"
       require_asset "#{jquery_ui_prefix}effect"
       require_asset "#{jquery_ui_prefix}effects/effect-highlight" if Jquery::Ui::Rails::VERSION >= '6.0.0'

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

@@ -57,6 +57,9 @@ jQuery(document).ready(function($) {
   jQuery(document).on('ajax:complete', 'form.live', function(event) {
     ActiveScaffold.focus_first_element_of_form(jQuery(this).closest("form"));
   });
+  jQuery(document).on('keyup keypress', 'form.search.live input', function(e) {
+    if (e.keyCode == 13) e.preventDefault();
+  });
   jQuery(document).on('ajax:error', 'form.as_form', function(event, xhr, status, error) {
     var as_div = jQuery(this).closest("div.active-scaffold");
     if (as_div.length) {
@@ -88,6 +91,7 @@ jQuery(document).ready(function($) {
       if (action_link.position) {
         action_link.insert(response);
         if (action_link.hide_target) action_link.target.hide();
+        if (action_link.hide_content) action_link.content.hide();
       } else {
         if (action_link.tag.hasClass('toggle')) {
           action_link.tag.closest('.action_group,.actions').find('.toggle.active').removeClass('active');
@@ -143,8 +147,6 @@ jQuery(document).ready(function($) {
   });
   jQuery(document).on('ajax:before', 'a.as_sort', function(event) {
     var as_sort = jQuery(this);
-    var history_controller_id = as_sort.data('page-history');
-    if (history_controller_id) addActiveScaffoldPageToHistory(as_sort.attr('href'), history_controller_id);
     as_sort.closest('th').addClass('loading');
     return true;
   });
@@ -173,8 +175,6 @@ jQuery(document).ready(function($) {
   });
   jQuery(document).on('ajax:before', 'a.as_paginate',function(event) {
     var as_paginate = jQuery(this);
-    var history_controller_id = as_paginate.data('page-history');
-    if (history_controller_id) addActiveScaffoldPageToHistory(as_paginate.attr('href'), history_controller_id);
     as_paginate.prevAll('img.loading-indicator').css('visibility','visible');
     return true;
   });
@@ -205,9 +205,10 @@ jQuery(document).ready(function($) {
 
   jQuery(document).on('change', 'input.update_form:not(.recordselect), textarea.update_form, select.update_form, .checkbox-list.update_form input:checkbox', function(event) {
     var element = jQuery(this);
-    var form_element = element.closest('.checkbox-list');
+    var form_element;
     var value, additional_params;
-    if (form_element.is(".checkbox-list")) {
+    if (element.is(".checkbox-list input:checkbox")) {
+      form_element = element.closest('.checkbox-list')
       value = form_element.find(':checked').map(function(item){return $(this).val();}).toArray();
       additional_params = (element.is(':checked') ? '_added=' : '_removed=') + element.val();
     } else {
@@ -290,34 +291,51 @@ jQuery(document).ready(function($) {
     e.preventDefault();
   });
 
-  /* setup some elements on page/form load */
-  ActiveScaffold.load_embedded(document);
-  ActiveScaffold.enable_js_form_buttons(document);
-  ActiveScaffold.live_search(document);
-  ActiveScaffold.auto_paginate(document);
-  ActiveScaffold.draggable_lists('.draggable-lists', document);
-  ActiveScaffold.sliders(document);
+  jQuery(document).on('click', 'form.as_form .no-color', function() {
+    var color_field = jQuery(this).parent().next(':input');
+    color_field.attr('type', jQuery(this).prop('checked') ? 'hidden' : 'color');
+    if (jQuery(this).prop('checked')) color_field.val('');
+  });
+
+  jQuery(document).on('turbolinks:before-visit', function() {
+    if (history.state.active_scaffold) {
+      history.replaceState({turbolinks: true, url: document.location.href}, '', document.location.href);
+    }
+  });
+
+  jQuery(window).on('popstate', function(e) {
+    var state = e.originalEvent.state;
+    if (!state || !state.active_scaffold) return;
+    jQuery.ajax({
+      url: document.location.href,
+      data: jQuery.extend({'_popstate': true}, state.active_scaffold),
+      dataType: 'script',
+      cache: true
+    });
+    jQuery('.active-scaffold:first th .as_sort:first').closest('th').addClass('loading');
+  });
+
+  // call setup on document.ready if Turbolinks not enabled
+  if (typeof(Turbolinks) == 'undefined' || !Turbolinks.supported) {
+    ActiveScaffold.setup_history_state();
+    ActiveScaffold.setup(document);
+  }
   if (ActiveScaffold.config.warn_changes) ActiveScaffold.setup_warn_changes();
-  jQuery(document).on('as:element_updated', function(e) {
-    ActiveScaffold.load_embedded(e.target);
-    ActiveScaffold.enable_js_form_buttons(e.target);
-    ActiveScaffold.live_search(e.target);
-    ActiveScaffold.draggable_lists('.draggable-lists', e.target);
-    ActiveScaffold.sliders(e.target);
+  jQuery(document).on('as:element_updated as:element_created', function(e, action_link) {
+      ActiveScaffold.setup(e.target);
+  });
+  jQuery(document).on('as:action_success', 'a.as_action', function(e, action_link) {
+    ActiveScaffold.setup(action_link.adapter);
   });
   jQuery(document).on('as:element_updated', '.active-scaffold', function(e) {
     if (e.target != this) return;
     var search = $(this).find('form.search');
     if (search.length) ActiveScaffold.focus_first_element_of_form(search);
   });
-  jQuery(document).on('as:action_success', 'a.as_action', function(e, action_link) {
-    ActiveScaffold.load_embedded(action_link.adapter);
-    ActiveScaffold.enable_js_form_buttons(action_link.adapter);
-    ActiveScaffold.live_search(action_link.adapter);
-    ActiveScaffold.auto_paginate(action_link.adapter);
-    ActiveScaffold.draggable_lists('.draggable-lists', action_link.adapter);
-    ActiveScaffold.sliders(action_link.adapter);
-  });
+});
+
+jQuery(document).on('turbolinks:load', function($) {
+  ActiveScaffold.setup(document);
 });
 
 
@@ -401,7 +419,7 @@ if (typeof(jQuery.fn.delayedObserver) === 'undefined') {
           var el = $(this);
           var op = options || {};
           el.data('oldval', el.val())
-            .data('delay', delay || 0.5)
+            .data('delay', delay === 0 ? delay : (delay || 0.5))
             .data('condition', op.condition || function() { return ($(this).data('oldval') == $(this).val()); })
             .data('callback', callback)
             [(op.event||'keyup')](function(){
@@ -428,6 +446,31 @@ if (typeof(jQuery.fn.delayedObserver) === 'undefined') {
 
 var ActiveScaffold = {
   last_focus: null,
+  setup: function(container) {
+    /* setup some elements on page/form load */
+    ActiveScaffold.load_embedded(container);
+    ActiveScaffold.enable_js_form_buttons(container);
+    ActiveScaffold.live_search(container);
+    ActiveScaffold.auto_paginate(container);
+    ActiveScaffold.draggable_lists('.draggable-lists', container);
+    ActiveScaffold.sliders(container);
+  },
+  setup_history_state: function() {
+    var data = {}, current_search_item = jQuery('.active-scaffold .filtered-message[data-search]');
+    if (current_search_item.length) {
+      // store user settings enabled, update state with current page, search and sorting
+      var sorted_columns = jQuery('th.sorted');
+      data.page = jQuery('.active-scaffold-pagination .current').text();
+      data.search = current_search_item.data('search');
+      if (sorted_columns.length == 1) {
+        data.sort = sorted_columns.attr('class').match(/(.+)-column/)[1];
+        data.sort_direction = sorted_columns.hasClass('asc') ? 'asc' : 'desc';
+      } else { // default search
+        jQuery.extend(data, {sort: '', sort_direction: ''});
+      }
+    }
+    ActiveScaffold.add_to_history(document.location.href, data, true);
+  },
   live_search: function(element) {
     jQuery('form.search.live input[type=search]', element).delayedObserver(function() {
      jQuery(this).parent().trigger("submit");
@@ -449,7 +492,7 @@ var ActiveScaffold = {
   sliders: function(element) {
     jQuery('.as-slider', element).each(function() {
       var opts = $(this).data('slider');
-      jQuery(this).slider(opts); 
+      jQuery(this).slider(opts);
       if (opts.disabled) jQuery(this).find('.ui-slider-handle').hide();
     });
   },
@@ -517,6 +560,12 @@ var ActiveScaffold = {
       element.removeClass("desc");
     });
   },
+  add_to_history: function(url, data, replace) {
+    if (!history || !history.pushState) return;
+    data = {active_scaffold: data};
+    if (replace) history.replaceState(data, null, url);
+    else history.pushState(data, null, url);
+  },
   decrement_record_count: function(scaffold) {
     // decrement the last record count, firsts record count are in nested lists
     if (typeof(scaffold) == 'string') scaffold = '#' + scaffold;
@@ -821,6 +870,10 @@ var ActiveScaffold = {
 
     if (element.length) {
       if (options.is_subform == false) {
+        if (typeof(options.hidden) != 'undefined') {
+          var li = element.closest('li');
+          li[options.hidden ? 'addClass' : 'removeClass'].call(li, 'hidden')
+        }
         this.replace(element.closest('dl'), content);
       } else {
         this.replace_html(element, content);
@@ -1029,23 +1082,15 @@ var ActiveScaffold = {
     });
     window.onbeforeunload = function() {
       if (jQuery('form.need-confirm').length) return unload_message;
-    }
+    };
+    jQuery(document).on('turbolinks:before-visit', function(e) {
+      if (jQuery('form.need-confirm').length) {
+        if (!window.confirm(unload_message)) e.preventDefault();
+      }
+    });
   }
 }
 
-/*
- * DHTML history tie-in
- */
-function addActiveScaffoldPageToHistory(url, active_scaffold_id) {
-  if (typeof dhtmlHistory == 'undefined') return; // it may not be loaded
-
-  var array = url.split('?');
-  var qs = new Querystring(array[1]);
-  var sort = qs.get('sort')
-  var dir = qs.get('sort_direction')
-  var page = qs.get('page')
-  if (sort || dir || page) dhtmlHistory.add(active_scaffold_id+":"+page+":"+sort+":"+dir, url);
-}
 
 /*
  * URL modification support. Incomplete functionality.
@@ -1126,6 +1171,7 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
     this.url = this.tag.attr('href');
     this.method = this.tag.data('method') || 'get';
     this.target = target;
+    this.content = target.closest('.active-scaffold').find('.as_content:first');
     this.loading_indicator = loading_indicator;
     this.hide_target = false;
     this.position = this.tag.data('position');
@@ -1149,6 +1195,7 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
       ActiveScaffold.remove(this.adapter, function() {
         link.enable();
         if (link.hide_target) link.target.show();
+        if (link.hide_content) link.content.show();
         if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(link.target.attr('id'), ActiveScaffold.config.scroll_on_close == 'checkInViewport');
       });
     }
@@ -1314,6 +1361,11 @@ ActiveScaffold.Actions.Table = ActiveScaffold.Actions.Abstract.extend({
 
 ActiveScaffold.ActionLink.Table = ActiveScaffold.ActionLink.Abstract.extend({
   insert: function(content) {
+    if (this.position == 'replace') {
+      this.position = 'top';
+      this.hide_content = true;
+    }
+
     if (this.position == 'top') {
       this.target.prepend(content);
       this.set_adapter(this.target.children().first());

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

@@ -1,7 +1,31 @@
-var action_link_close = ActiveScaffold.ActionLink.Abstract.prototype.close;       
-ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
-  jQuery(this.adapter).find('textarea.mceEditor').each(function(index, elem) {         
-    tinyMCE.execCommand('mceRemoveEditor', false, jQuery(elem).attr('id'));
+(function() {
+  var action_link_close = ActiveScaffold.ActionLink.Abstract.prototype.close;
+  ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
+    jQuery(this.adapter).find('textarea.mceEditor').each(function(index, elem) {
+      tinyMCE.remove('#' + jQuery(elem).attr('id'));
+    });
+    action_link_close.apply(this);
+  };
+
+  function loadTinyMCE() {
+    var settings = jQuery(this).data('tinymce');
+    if (settings) tinyMCE.settings = settings;
+    tinyMCE.execCommand('mceAddEditor', false, jQuery(this).attr('id'));
+  }
+
+  jQuery(document).on('submit', 'form.as_form', function() {
+    tinymce.triggerSave();
+    jQuery('textarea.mceEditor', this).each(function() { tinymce.remove('#'+jQuery(this).attr('id')); });
   });
-  action_link_close.apply(this);  
-};
+  /* for persistent update forms */
+  jQuery(document).on('ajax:complete', 'form.as_form', function() {
+    jQuery('textarea.mceEditor', this).each(loadTinyMCE);
+  });
+  /* enable tinymce textarea after form open */
+  jQuery(document).on('as:action_success', 'a.as_action', function(event) {
+    var action_link = ActiveScaffold.ActionLink.get(jQuery(this));
+    if (action_link && action_link.adapter) {
+      jQuery(action_link.adapter).find('textarea.mceEditor').each(loadTinyMCE);
+    }
+  });
+})();

data/app/assets/javascripts/prototype/tiny_mce_bridge.js

@@ -1,7 +1,17 @@
 var action_link_close = ActiveScaffold.ActionLink.Abstract.prototype.close;
 ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
   this.adapter.select('textarea.mceEditor').each(function(elem) {
-    tinyMCE.execCommand('mceRemoveEditor', false, elem.id);
+    tinymce.remove('#'+elem.id);
   }); 
   action_link_close.apply(this);
 };
+document.on('submit', 'form.as_form', function() {
+  tinymce.triggerSave();
+  this.select('textarea.mceEditor').each(function(elem) { tinymce.remove('#'+elem.id); });
+});
+/* for persistent update forms */
+document.on('ajax:complete', 'form.as_form', function(event) {
+  this.select('textarea.mceEditor').each(function(elem) {
+    tinyMCE.execCommand('mceAddEditor', false, elem.id);
+  });
+});