widget_list 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a4a7f836ad410d0cedd3471ebd645479d96eba8933e82be357fbf0bbc140ea0
-  data.tar.gz: 7fe3cdbe6e2aecae40f6192fcd4f9e1ac87a83ec8db70b3790bd67c46392d6ab
+  metadata.gz: 65e24eab11f0979fb9b5345f2abc750120245e1a3170c1c3cf4314650e01b42b
+  data.tar.gz: 49994c8e04a8fed60a7605cf896e78f79d6bdcabd5407a780ba8ceaeae9142fd
 SHA512:
-  metadata.gz: f3658252db5d9e1e9b3665f7d38a2853a55427d5a73e57871e8e9649dc49b6eca71ccf5296f73a586baf8a6f011a25d4577630519fb3f7a1ad88ecc44d840221
-  data.tar.gz: f59f51c7b0338638a0a27fa674517ccee1f5367cc24aeecbcf59cb577b4732d842da7fad47f2a1c072000b5c8d215de6a790fa430c7ccaa73af2a7ab28d96f34
+  metadata.gz: 4876ec92b2d1cf146f96d9b777575ff44ece4f3e707bed4098fef565025fc2a321246dbf200b084ef9ae847bd6822262ab39a68979213d9a2b3f8044f330399d
+  data.tar.gz: bbbeaf1232b1db0c48452af7dbd42b980e403ec3f3fb843aace3df2b9364af425256a945cc9dc3dea08e985853c2d4ec2d881e3d61b161b8236d2a6bc60d8cd9

data/README.md

@@ -1,9 +1,15 @@
 # widget_list
 
-`widget_list` renders sortable, searchable Rails data grids with Ajax paging and CSV export. Version 2.0.0 has been exercised with **Rails 8.1.4**, **Ruby 3.4.11**, **Sequel 5.109.0**, **Ransack 5.0.2**, and SQLite. Rails 8.1 requires Ruby 3.2 or newer. The Rails 3 era guide remains in [docs/legacy-readme.md](docs/legacy-readme.md) for reference.
+`widget_list` renders sortable, searchable Rails data grids with Ajax paging and CSV export. Version 2.0.0 has been exercised with **Rails 8.1.4**, **Ruby 3.4.11**, **Sequel 5.109.0**, **Ransack 5.0.2**, and SQLite. The restored administration console is in the 2.0.1 source on `main`; publish 2.0.1 before installing it from RubyGems. Rails 8.1 requires Ruby 3.2 or newer. The Rails 3 era guide remains in [docs/legacy-readme.md](docs/legacy-readme.md) for reference.
 
 The runnable [widget_list_example_rails8](https://github.com/davidrenne/widget_list_example_rails8/) contains both a Sequel SQL list and a Ransack/Active Record list. Its README and single commit diff show every caller change needed in a fresh Rails 8 app.
 
+## Video demo
+
+[![Play the original widget_list demo](docs/widget-list-demo-thumbnail.png)](https://www.youtube.com/watch?v=A6mZa8Ge2Rk)
+
+This video shows the original 1.x interface. For the Rails 8 integration, use the current example app below.
+
 ## Add it to a Rails 8 app
 
 `widget_list` uses jQuery and Sprockets assets. In your Gemfile:
@@ -14,12 +20,6 @@ gem 'jquery-rails'
 gem 'widget_list', '~> 2.0'
 ```
 
-For local development before publishing version 2.0.0, replace the last line with:
-
-```ruby
-gem 'widget_list', path: '../widget_list'
-```
-
 Run `bundle install`. Add `app/assets/config/manifest.js`:
 
 ```javascript
@@ -44,10 +44,28 @@ Load the assets in the application layout's `<head>`:
 ```erb
 <%= csrf_meta_tags %>
 <%= stylesheet_link_tag 'application', 'widget_list', 'widgets' %>
-<%= javascript_include_tag 'application', defer: true %>
+<%= javascript_include_tag 'application' %>
 ```
 
-The gem resolves its image URLs through Sprockets when compiling CSS. No manual image copy or static middleware is needed. An app using the default Rails 8 Propshaft pipeline should replace `propshaft` with `sprockets-rails` for this integration. Run `bin/rails assets:precompile` to check production assets.
+Load this script in the layout's `<head>` without `defer`: the administration wizard's inline script needs jQuery as it is parsed. The gem resolves its image URLs through Sprockets when compiling CSS. No manual image copy or static middleware is needed. An app using the default Rails 8 Propshaft pipeline should replace `propshaft` with `sprockets-rails` for this integration. Run `bin/rails assets:precompile` to check production assets.
+
+## Themes
+
+`widget_list` lets a theme provide default colors, type, borders, and button styles through `WidgetListThemeHelper::ThemeDefaults`. Settings passed to an individual `WidgetList.go!` call override theme defaults. A theme can also ship a stylesheet for finer control.
+
+| Theme | Appearance | Compatibility |
+| --- | --- | --- |
+| [AI theme](https://github.com/davidrenne/widget_list_theme_ai) | Midnight surfaces, cyan and violet accents, modern grid controls | Built for widget_list 2.x and Rails 8 |
+| [Cruddy](https://github.com/davidrenne/widget_list_theme_cruddy) | Warm, textured classic style | Legacy 1.x theme; requires migration for 2.x |
+| [Blue Sky Basin](https://github.com/davidrenne/widget_list_theme_blue_sky_basin) | Blue mountain inspired palette | Legacy 1.x theme; requires migration for 2.x |
+
+The AI theme is under development. To try it in your own Rails app, check out `widget_list_theme_ai` next to the app and add this line to its Gemfile:
+
+```ruby
+gem 'widget_list_theme_ai', path: '../widget_list_theme_ai'
+```
+
+Then run `bundle install`, add `//= link widget_list_theme_ai.css` to `app/assets/config/manifest.js`, and load `widget_list_theme_ai` after `widget_list` and `widgets` in the layout's `stylesheet_link_tag`. The theme uses a local system font stack and makes no external font request. See the [theme README on the preview branch](https://github.com/davidrenne/widget_list_theme_ai/tree/codex/ai-theme) for the complete setup and the example's `codex/ai-theme-example` branch for a working caller. That branch also uses the local core checkout for a pagination fix pending release.
 
 ## Choose a database source
 
@@ -118,10 +136,11 @@ A standard GET URL such as `/items?q[name_cont]=Apple` applies the filter. The g
 
 ## Try the example
 
-With `widget_list` and `widget_list_example_rails8` checked out as sibling directories:
+The example installs the published 2.0.0 gem from RubyGems. Clone and run it anywhere:
 
 ```sh
-cd ../widget_list_example_rails8
+git clone https://github.com/davidrenne/widget_list_example_rails8.git
+cd widget_list_example_rails8
 bundle install
 bin/rails db:prepare
 bin/rails db:seed
@@ -129,16 +148,75 @@ bin/rails test
 bin/rails server
 ```
 
-Open `http://127.0.0.1:3000/` for Sequel or `/ransack` for Active Record. Search SKU `1001`, change pages, export CSV, or open the filter arrow and set **Name contains Apple**. The example uses a relative Bundler `path:` dependency, so edits to this gem are picked up after restarting the server.
+Open `http://127.0.0.1:3000/` for Sequel or `/ransack` for Active Record. Search SKU `1001`, change pages, export CSV, or open the filter arrow and set **Name contains Apple**.
+
+## Administration console
+
+The original administration wizard is restored in the [Rails 8 migration example](https://github.com/davidrenne/widget_list_example). Open `/administration` there to choose an Active Record model and fields, configure sorting, search, row buttons and export, preview the list, then generate starter controller code. Hidden fields, field functions, grouping fields, and the drill-down value column use dropdowns populated from the selected model's table columns. The drill-down display column remains editable for custom expressions. The example routes the wizard only in development and test. It uses the sibling `widget_list` checkout, so the console fixes require the 2.0.1 source until that version is published.
+
+To add the wizard to your own app, first complete the asset setup above. Then add a GET/POST route, a controller action, and a view:
+
+```ruby
+# config/routes.rb
+if Rails.env.development? || Rails.env.test?
+  match '/administration', to: 'widget_list_examples#administration',
+        via: [:get, :post], as: :administration
+end
+
+# app/controllers/widget_list_examples_controller.rb
+class WidgetListExamplesController < ApplicationController
+  def administration
+    @output = WidgetList.go!
+    render json: JSON.parse(@output) if params.key?(:ajax)
+  end
+end
+```
+
+```erb
+<%# app/views/widget_list_examples/administration.html.erb %>
+<div style="margin: 50px"><%= raw @output %></div>
+
+<%# Link from a page in development %>
+<%= link_to 'Administration Console', administration_path if Rails.env.development? %>
+```
+
+If `config/widget-list.yml` points `primary` at Sequel and `secondary` at Active Record, leave **Primary Connection?** unchecked when selecting a model. The wizard now defaults to that choice. Ransack requires the model's `ransackable_attributes` allowlist shown above. The generated action needs a GET/POST route and a view that renders `@output`, just like a hand-written list. Review the generated fields, links and controller code before using it. The wizard writes draft configuration to `config/widget-list-administration.json` and saved configurations to `config/widget-list-administration-all.json`; the example ignores both files in Git. Keep the route accessible only to trusted developers: the preview evaluates generated Ruby and the wizard writes files.
+
+These are the original screenshots from the Rails 3 era. The Rails 8 wizard uses the same steps, while its generated code and preview have been updated for Rails 8 and Ransack 5.
+
+| Start with a model | Configure search and export |
+| --- | --- |
+| ![Original administration start screen](docs/screenshots/admin1.jpg) | ![Original search and export settings](docs/screenshots/admin2.jpg) |
+
+| Select fields | Configure row buttons |
+| --- | --- |
+| ![Original field selection](docs/screenshots/admin3.jpg) | ![Original row buttons](docs/screenshots/admin4.jpg) |
+
+| Preview the list | Generate controller code |
+| --- | --- |
+| ![Original list preview](docs/screenshots/admin5.png) | ![Original generated code](docs/screenshots/admin6.png) |
+
+<details>
+<summary>More original widget_list screenshots</summary>
+
+![Original widget_list table](docs/screenshots/main.png)
+![Original filtered list](docs/screenshots/filtered.png)
+![Original search](docs/screenshots/search.png)
+![Original Ransack search](docs/screenshots/ransack1.png)
+![Original Ransack filters](docs/screenshots/ransack2.png)
+![Original combined Ransack filters](docs/screenshots/ransack3.png)
+![Original Blue Sky Basin theme](docs/screenshots/theme_blue_sky_basin.png)
+
+</details>
 
 ## Release
 
-The RubyGems page takes its short summary and longer description from `gem.summary` and `gem.description` in [widget_list.gemspec](widget_list.gemspec). Edit those fields before building and publishing a new version; changing GitHub or the RubyGems web page does not update an already published gem version.
+Version 2.0.0 is published; the administration console fixes are prepared as 2.0.1 on `main` and have not been published. The RubyGems page takes its short summary and longer description from `gem.summary` and `gem.description` in [widget_list.gemspec](widget_list.gemspec). To change them in a future release, bump `WidgetList::VERSION` in `lib/widget_list/version.rb` and publish a new version; published versions cannot be overwritten.
 
-`./checkin_gem.sh` validates and builds the gem, and runs the sibling Rails 8 example tests when present. Review and commit your changes on `main`. Sign in to the command-line publisher with `gem signin` if needed, using an API key with the `push_rubygem` scope. A RubyGems website session does not sign in the `gem` command. Then run `./publish_gem.sh`; it checks that the tree is clean, builds the package, and pushes it to RubyGems.org. RubyGems may prompt for MFA in the terminal or open a browser for WebAuthn. No credential is stored in these scripts. Publishing is a separate, intentional step from committing.
+`./checkin_gem.sh` validates and builds the gem, and runs the sibling local-source Rails 8 example tests when present. Review and commit your changes on `main`. Sign in to the command-line publisher with `gem signin` if needed, using an API key with the `push_rubygem` scope. A RubyGems website session does not sign in the `gem` command. Then run `./publish_gem.sh`; it checks that the tree is clean, builds the package, and pushes it to RubyGems.org. RubyGems may prompt for MFA in the terminal or open a browser for WebAuthn. No credential is stored in these scripts. Publishing is a separate, intentional step from committing.
 
 See [RubyGems publishing](https://guides.rubygems.org/publishing/) and [MFA setup](https://guides.rubygems.org/setting-up-otp-mfa/) for account setup.
 
 ## Upgrade notes
 
-The migration replaced Rails 3 callbacks and asset middleware, Ruby's removed `URI.decode`, unsafe SQL `eval`, and process-wide request globals. Ransack 5 requires explicit `ransackable_attributes` in each searchable model. The original 2013 administration builder and non-SQLite adapters are still historical code paths; the Rails 8 example verifies the list, Ajax search, pagination, advanced Ransack filtering, CSV export, and asset compilation.
+The migration replaced Rails 3 callbacks and asset middleware, Ruby's removed `URI.decode`, unsafe SQL `eval`, and process-wide request globals. Ransack 5 requires explicit `ransackable_attributes` in each searchable model. The Rails 8 examples verify the list, Ajax search, pagination, advanced Ransack filtering, CSV export, and asset compilation. The migration example also exercises the administration wizard, its preview, and generated code. Non-SQLite adapters remain unverified.

data/app/views/widget_list/administration/_button_row.html.erb

@@ -3,7 +3,7 @@
     <!--TEXT_DESC-->:&#160;<input type="text" class="<!--SUBJECT-->_<!--TEXT_KEY-->" style="width:170px" onblur="jQuery(this).attr('value',jQuery(this).val().trim());<!--ONBLUR1-->" name="<!--SUBJECT-->[<!--TEXT_KEY-->][]" id="<!--SUBJECT-->[<!--TEXT_KEY-->][]" value="<!--BUTTON_TEXT-->"/><%= raw WidgetList::Widgets::widget_button('?',  {'onclick' => "alert('<!--TEXT_HELP-->')", 'innerClass' => "default <!--SUBJECT-->_<!--TEXT_KEY-->_button" }, true ) %>
   </td>
   <td>
-    <!--URL_DESC-->:&#160;<input type="text" class="<!--SUBJECT-->_<!--URL_KEY-->" style="width:170px" onblur="jQuery(this).attr('value',jQuery(this).val().trim());<!--ONBLUR2-->" name="<!--SUBJECT-->[<!--URL_KEY-->][]" id="<!--SUBJECT-->[<!--URL_KEY-->][]" value="<!--BUTTON_URL-->"/><%= raw WidgetList::Widgets::widget_button('?',  {'onclick' => "alert('<!--2_HELP->')", 'innerClass' => "default <!--SUBJECT-->_<!--URL_KEY-->_button" }, true ) %>
+    <!--URL_DESC-->:&#160;<% if local_assigns[:middle_column_select] %><select class="<!--SUBJECT-->_<!--URL_KEY--> widget-list-column-select" style="width:170px" name="<!--SUBJECT-->[<!--URL_KEY-->][]" data-selected="<!--BUTTON_URL-->" onchange="<!--ONBLUR2-->"><option value="">Select a column</option></select><% else %><input type="text" class="<!--SUBJECT-->_<!--URL_KEY-->" style="width:170px" onblur="jQuery(this).attr('value',jQuery(this).val().trim());<!--ONBLUR2-->" name="<!--SUBJECT-->[<!--URL_KEY-->][]" id="<!--SUBJECT-->[<!--URL_KEY-->][]" value="<!--BUTTON_URL-->"/><% end %><%= raw WidgetList::Widgets::widget_button('?',  {'onclick' => "alert('<!--2_HELP->')", 'innerClass' => "default <!--SUBJECT-->_<!--URL_KEY-->_button" }, true ) %>
   </td>
   <td>
     <!--COLOR_DESC-->:&#160;<input type="text" class="<!--SUBJECT-->_<!--COLOR_KEY-->" style="width:170px" onblur="jQuery(this).attr('value',jQuery(this).val().trim());<!--ONBLUR3-->" name="<!--SUBJECT-->[<!--COLOR_KEY-->][]" id="<!--SUBJECT-->[<!--COLOR_KEY-->][]" value="<!--BUTTON_CLASS-->"/><%= raw WidgetList::Widgets::widget_button('?',  {'onclick' => "alert('<!--COLOR_HELP-->')", 'innerClass' => "default <!--SUBJECT-->_<!--COLOR_KEY-->_button" }, true ) %>
@@ -11,4 +11,4 @@
   <td>
     <!--REMOVE_FIELD_BUTTON-->
   </td>
-</tr>
+</tr>

data/app/views/widget_list/administration/_field_row.html.erb

@@ -1,6 +1,6 @@
 <tr style="<!--TR_STYLE-->">
   <td  style="<!--TR1_STYLE-->">
-    <!--FIELD-->:&#160;<input type="text" style="width:350px" class="<!--SUBJECT-->_keys" onblur="jQuery(this).attr('value',jQuery(this).val().trim());<!--ONBLUR1-->" name="<!--SUBJECT-->[key][]" id="<!--SUBJECT-->[key][]" value="<!--FIELD_VALUE-->"/>
+    <!--FIELD-->:&#160;<% if local_assigns[:key_select] %><select style="width:350px" class="<!--SUBJECT-->_keys widget-list-column-select" name="<!--SUBJECT-->[key][]" data-selected="<!--FIELD_VALUE-->" onchange="<!--ONBLUR1-->"><option value="">Select a column</option></select><% else %><input type="text" style="width:350px" class="<!--SUBJECT-->_keys" onblur="jQuery(this).attr('value',jQuery(this).val().trim());<!--ONBLUR1-->" name="<!--SUBJECT-->[key][]" id="<!--SUBJECT-->[key][]" value="<!--FIELD_VALUE-->"/><% end %>
   </td>
   <td>
     <!--DESC-->:&#160;<input <!--DISABLED--> type="text" style="width:350px" class="<!--SUBJECT-->_descriptions"  onblur="jQuery(this).attr('value',jQuery(this).val().trim());<!--ONBLUR2-->" name="<!--SUBJECT-->[description][]" id="<!--SUBJECT-->[description][]" value="<!--FIELD_DESC-->"/>
@@ -9,4 +9,4 @@
     <!--REMOVE_FIELD_BUTTON-->
   </td>
 </tr>
-<!--EXTRA-->
+<!--EXTRA-->

data/app/views/widget_list/administration/_output.html.erb

@@ -39,6 +39,10 @@
   var all = '.init,.start,.fields,.rows,.search,.footer,.misc_submit';
   var all_btns = '#start,#fields,#rows,#search,#footer,#misc_submit';
   jQuery(document).ready(function () {
+    PopulateColumnSelects();
+    jQuery(document).on('change', 'select.widget-list-column-select', function () {
+      jQuery(this).attr('data-selected', this.value);
+    });
     if (jQuery('#view').val() != '') {
       jQuery(all_btns).removeClass('disabled');
     }
@@ -49,6 +53,9 @@
     }
 
     window.onbeforeunload = function (evt) {
+      if (isSubmitting) {
+        return;
+      }
       var message = 'Are you sure you want to abandon this widget_list implementation?  Doing so will lose all your work?';
       if (typeof evt == 'undefined') {
         evt = window.event;
@@ -57,9 +64,7 @@
       if (evt) {
         evt.returnValue = message;
       }
-      if (!isSubmitting) {
-        return message;
-      }
+      return message;
     }
 
   });
@@ -82,33 +87,29 @@
       var by_pass = false;
     }
     if (by_pass || VerifyOK(func_name)) {
-      jQuery('.search_dependent').hide(0,function() {
-        jQuery(all).hide(0,function() {
-          jQuery(which_class).fadeIn(0,function() {
-            if (func_name == 'ShowSearch') {
-              ShowSearchOptions(function() {
-                ShowGroupingOptions();
-                ShowExportOptions();
-
-              });
-            }
-            if (func_name == 'ShowFields') {
-              ShowHiddenOptions();
-              ShowFunctionOptions();
-            }
-            if (func_name == 'ShowSubmit') {
-              ShowCheckboxOptions();
-            }
-            if (func_name == 'ShowRows') {
-              ShowButtonOptions();
-              ShowDrillDownOptions();
-            }
-            if (func_name == 'ShowFooter') {
-              ShowFooterOptions();
-            }
-          });
+      jQuery('.search_dependent').hide();
+      jQuery(all).hide();
+      jQuery(which_class).show();
+      if (func_name == 'ShowSearch') {
+        ShowSearchOptions(function() {
+          ShowGroupingOptions();
+          ShowExportOptions();
         });
-      });
+      }
+      if (func_name == 'ShowFields') {
+        ShowHiddenOptions();
+        ShowFunctionOptions();
+      }
+      if (func_name == 'ShowSubmit') {
+        ShowCheckboxOptions();
+      }
+      if (func_name == 'ShowRows') {
+        ShowButtonOptions();
+        ShowDrillDownOptions();
+      }
+      if (func_name == 'ShowFooter') {
+        ShowFooterOptions();
+      }
 
       if (!by_pass) {
         SaveChanges();
@@ -141,31 +142,60 @@
     ClickTab('.misc_submit',arguments.callee.name);
   }
 
+  function SetColumnValue(control, value) {
+    var field = jQuery(control);
+    if (field.is('select') && !field.find('option').filter(function () { return this.value == value; }).length) {
+      field.append(jQuery('<option>').val(value).text(value));
+    }
+    field.val(value);
+    field.attr(field.is('select') ? 'data-selected' : 'value', value);
+  }
+
+  function PopulateColumnSelects() {
+    var columns = jQuery('#checkboxField option').map(function () { return this.value; }).get().filter(Boolean);
+    if (!columns.length) return;
+
+    jQuery('select.widget-list-column-select').each(function () {
+      var field = jQuery(this);
+      var selected = field.val() || field.attr('data-selected') || '';
+      if (['column_name', 'col_name', 'field_name'].indexOf(selected) !== -1) selected = '';
+
+      field.empty().append(jQuery('<option>').val('').text(field.hasClass('group_by_keys') ? 'All items / select a column' : 'Select a column'));
+      columns.forEach(function (column) {
+        field.append(jQuery('<option>').val(column).text(column));
+      });
+      if (selected && columns.indexOf(selected) === -1) {
+        field.append(jQuery('<option>').val(selected).text(selected + ' (saved value)'));
+      }
+      SetColumnValue(field, selected);
+    });
+  }
+
   function ReplaceColumnsToLinked(obj) {
+    var isPassColumn = jQuery(obj).hasClass('drill_downs_data_to_pass_from_view');
+    var displayColumn = jQuery(obj).closest('tr').find('.drill_downs_column_to_show').val() || '';
+    if (isPassColumn && displayColumn.endsWith('_linked')) return;
     found = false;
-    var className = obj.className;
     jQuery(obj).css('background-color','white');
     jQuery('.fields_keys, .fields_hidden_keys, .fields_function_keys').each(
       function(key, value) {
         if(jQuery(value).val() == jQuery(obj).val().trim() && jQuery(obj).val().search(/_linked/i) == -1) {
           found = true;
           var id_original = jQuery(obj).val().trim();
-          jQuery(value).val(jQuery(obj).val().trim() + '_linked');
-          jQuery(obj).val(jQuery(obj).val().trim() + '_linked');
-          jQuery(obj).attr('value',jQuery(this).val().trim());
-          if (className == 'drill_downs_data_to_pass_from_view') {
+          SetColumnValue(value, jQuery(obj).val().trim() + '_linked');
+          SetColumnValue(obj, isPassColumn ? id_original : id_original + '_linked');
+          if (isPassColumn) {
             jQuery('.drill_downs_column_to_show[value="col_name"]').each(
               function(key1, value1) {
-                jQuery(value1).val(jQuery(obj).val().trim());
-                jQuery(value1).attr('value',jQuery(value1).val().trim());
+                jQuery(value1).val(id_original + '_linked');
+                jQuery(value1).attr('value',id_original + '_linked');
                 return false;
               }
             )
           } else {
-            jQuery('.drill_downs_data_to_pass_from_view[value="col_name"]').each(
+            jQuery('.drill_downs_data_to_pass_from_view').filter(function () { return !this.value || this.value == 'col_name'; }).each(
               function(key1, value1) {
-                jQuery(value1).val(jQuery(obj).val().trim());
-                jQuery(value1).attr('value',jQuery(value1).val().trim());
+                SetColumnValue(value1, id_original);
                 return false;
               }
             )
@@ -182,10 +212,9 @@
 
           jQuery('#showHidden').attr('checked',true);
           AddHiddenField();
-          jQuery('.fields_hidden_keys[value=""]').each(
+          jQuery('.fields_hidden_keys').filter(function () { return !this.value; }).each(
               function(key1, value1) {
-                jQuery(value1).val(id_original);
-                jQuery(value1).attr('value',id_original);
+                SetColumnValue(value1, id_original);
                 return false;
               }
           );
@@ -200,6 +229,7 @@
   }
 
   function InvalidField(obj) {
+    if (!jQuery(obj).val()) return;
     found = false;
     jQuery(obj).css('background-color','white');
     jQuery('.fields_keys, .fields_hidden_keys, .fields_function_keys').each(
@@ -330,6 +360,7 @@
 
   function AddGroupBy() {
     jQuery('#grouping_table').html(jQuery('#grouping_table').html() + jQuery('#default_grouping_template').html());
+    PopulateColumnSelects();
   }
 
   function AddButton() {
@@ -339,6 +370,7 @@
 
   function AddDrillDown() {
     jQuery('#drill_down_table').html(jQuery('#drill_down_table').html() + jQuery('#default_drill_down_template').html());
+    PopulateColumnSelects();
   }
 
   function AddFooterButton() {
@@ -348,10 +380,12 @@
 
   function AddHiddenField() {
     jQuery('#hidden_field_table').html(jQuery('#hidden_field_table').html() + jQuery('#default_hidden_field_template').html());
+    PopulateColumnSelects();
   }
 
   function AddFieldFunction() {
     jQuery('#field_function_table').html(jQuery('#field_function_table').html() + jQuery('#default_field_function_template').html());
+    PopulateColumnSelects();
   }
 
   function FakeCheck(obj) {
@@ -360,11 +394,11 @@
 
   function RemoveField(obj) {
     var isHiddenRemoval = false;
-    if (jQuery(obj).parent().parent().find('input.fields_hidden_keys').length > 0) {
+    if (jQuery(obj).parent().parent().find('.fields_hidden_keys').length > 0) {
       isHiddenRemoval = true;
     }
     var isFunctionRemoval = false;
-    if (jQuery(obj).parent().parent().find('input.fields_function_keys').length > 0) {
+    if (jQuery(obj).parent().parent().find('.fields_function_keys').length > 0) {
       isFunctionRemoval = true;
     }
 
@@ -406,10 +440,9 @@
     }
     AddHiddenField();
     jQuery('.hidden_fields_dependent').show();
-    jQuery('.fields_hidden_keys[value=""]').each(
+    jQuery('.fields_hidden_keys').filter(function () { return !this.value; }).each(
         function(key1, value1) {
-          jQuery(value1).val(field_name);
-          jQuery(value1).attr('value',field_name);
+          SetColumnValue(value1, field_name);
           return false;
         }
     );
@@ -439,17 +472,16 @@
     if (jQuery('#fieldFunctionOn').not(':checked')) {
       jQuery('#fieldFunctionOn').attr('checked',true);
     }
-    var objExists = '.fields_function_keys[value="' + field_name + '"]';
-    if (jQuery(objExists).length > 0) {
+    var objExists = jQuery('.fields_function_keys').filter(function () { return this.value == field_name; });
+    if (objExists.length > 0) {
       alert('Field Function for ' + field_name + ' already exists, please modify');
       jQuery(objExists).css('background-color','pink');
     } else {
       AddFieldFunction();
       jQuery('.function_dependent').show();
-      jQuery('.fields_function_keys[value=""]').each(
+      jQuery('.fields_function_keys').filter(function () { return !this.value; }).each(
           function(key1, value1) {
-            jQuery(value1).val(field_name);
-            jQuery(value1).attr('value',field_name);
+            SetColumnValue(value1, field_name);
             return false;
           }
       );
@@ -466,7 +498,7 @@
 
   function ShowField(obj) {
 
-    var field_name = jQuery(obj).parent().parent().find('input.fields_hidden_keys').val();
+    var field_name = jQuery(obj).parent().parent().find('.fields_hidden_keys').val();
     RemoveField(obj);
     AddField();
     jQuery('.fields_keys[value=""]').each(
@@ -504,6 +536,7 @@
         jQuery('#checkboxField').html(response['checked_fields']);
         jQuery('#footer_table').html(response['footer_buttons']);
         jQuery('#grouping_table').html(response['group_by']);
+        PopulateColumnSelects();
         SaveChanges();
         if (jQuery(obj).val() != '') {
           jQuery(all_btns).removeClass('disabled');
@@ -521,7 +554,7 @@
         if (jQuery(obj).val() != '' && jQuery('#showExport').is(':checked')) {
           jQuery('#exportButtonTitle').val('Export All ' + jQuery(obj).val() + 's');
         }
-      }, "json").error(function(response) {
+      }, "json").fail(function(response) {
                 alert('An error occurred instantiating this model.  Check the response for errors.');
               });
     }
@@ -568,6 +601,7 @@
 
 </script>
 <form action="<!--POST_URL-->" method="post" id="widget_list_administration">
+  <input type="hidden" name="authenticity_token" value="<!--AUTH_TOKEN-->"/>
   <h1 style="font-size:24;"><!--TITLE--></h1><div class="horizontal_rule"></div>
   <h3>Get started quickly by selecting the features you need for this list</h3>
   <table>
@@ -1098,4 +1132,4 @@
       </tr>
 
   </table>
-</form>
+</form>

data/checkin_gem.sh

@@ -5,7 +5,7 @@ cd "$(dirname "$0")"
 version=$(ruby -Ilib -rwidget_list/version -e 'print WidgetList::VERSION')
 gem build widget_list.gemspec --output "widget_list-${version}.gem"
 
-example_dir="../widget_list_example_rails8"
+example_dir="../widget_list_example"
 if [[ -f "${example_dir}/bin/rails" ]]; then
   (cd "$example_dir" && bundle install && bin/rails test)
 fi

data/docs/legacy-readme.md

@@ -65,31 +65,31 @@ In rails you have will_paginate and other ones like it using the ActiveRecord ap
 
 ### Main Example Loaded:
 
-![](http://davidrenne.com/github/widget_list/main.png)
+![](screenshots/main.png)
 
 ###Filter Drop Downs:
 
-![](http://davidrenne.com/github/widget_list/filtered.png)
+![](screenshots/filtered.png)
 
 ###Searching a row (with wild card search):
 
-![](http://davidrenne.com/github/widget_list/search.png)
+![](screenshots/search.png)
 
 ###Searching "name=asdf_18" (With ActiveRecord and Ransack hook):
 
-![](http://davidrenne.com/github/widget_list/ransack1.png)
+![](screenshots/ransack1.png)
 
 ###Searching "name=asdf_18" and "sku<9000"(With ActiveRecord and Ransack hook):
 
-![](http://davidrenne.com/github/widget_list/ransack2.png)
+![](screenshots/ransack2.png)
 
 ###Searching "name=asdf_18" and "sku < 9000" and "price > 67" (With ActiveRecord and Ransack hook):
 
-![](http://davidrenne.com/github/widget_list/ransack3.png)
+![](screenshots/ransack3.png)
 
 ###Theme plugins/gem support ([The Blue Sky Basin Theme][2]):
 
-![](http://davidrenne.com/github/widget_list/theme_blue_sky_basin.png)
+![](screenshots/theme_blue_sky_basin.png)
 
 ****
 
@@ -114,21 +114,21 @@ And then add this to a clean controller.  If you have code below, please return
 
 Next you will see this interface which will build some starter code for you:
 
-![](http://davidrenne.com/github/widget_list/admin1.jpg)
+![](screenshots/admin1.jpg)
 
-![](http://davidrenne.com/github/widget_list/admin2.jpg)
+![](screenshots/admin2.jpg)
 
-![](http://davidrenne.com/github/widget_list/admin3.jpg)
+![](screenshots/admin3.jpg)
 
-![](http://davidrenne.com/github/widget_list/admin4.jpg)
+![](screenshots/admin4.jpg)
 
 ###As you can see below, there is a preview iframe of what you are configuring:
 
-![](http://davidrenne.com/github/widget_list/admin5.png)
+![](screenshots/admin5.png)
 
 ###And finally, the code is output to get you started
 
-![](http://davidrenne.com/github/widget_list/admin6.png)
+![](screenshots/admin6.png)
 
 ****
 

data/lib/extensions/action_controller_base.rb

@@ -8,6 +8,7 @@ module WidgetList
       RequestContext.session = session.to_h.deep_dup
       RequestContext.server = request.env
       RequestContext.request = request.filtered_parameters
+      RequestContext.csrf_token = form_authenticity_token
 
       yield
     ensure

data/lib/widget_list/request_context.rb

@@ -1,5 +1,5 @@
 module WidgetList
   class RequestContext < ActiveSupport::CurrentAttributes
-    attribute :request, :server, :session, :used
+    attribute :request, :server, :session, :used, :csrf_token
   end
 end

data/lib/widget_list/version.rb

@@ -1,3 +1,3 @@
 module WidgetList
-  VERSION = "2.0.0"
+  VERSION = "2.0.2"
 end

data/lib/widget_list.rb

@@ -43,10 +43,12 @@ module WidgetList
 
 
       #Loop models
-      models = Dir[ Rails.root.join("app", "models").to_s + '**/*'].reject {|fn| File.directory?(fn) }
+      models = Dir[Rails.root.join('app', 'models', '**', '*.rb').to_s].reject do |path|
+        File.basename(path) == 'application_record.rb'
+      end
       if !models.empty?
         model_options = '<option value="">Select a Model</option>' + models.collect { |model|
-          model_name = model.split('/').last.to_s.camelize.gsub(/.rb/,'')
+          model_name = File.basename(model, '.rb').camelize
           "<option value='#{model_name}' #{((@isEditing && page_config['view'] == model_name) ? 'selected' : '')}>#{model_name}</option>"
         }.sort.uniq.join('')
       else
@@ -119,7 +121,10 @@ module WidgetList
       @fill['<!--VIEW_OPTIONS-->']              = model_options
       @fill['<!--TITLE_VALUE-->']               = (!@isEditing) ? '' : page_config['title']
       @fill['<!--DESC_VALUE-->']                = (!@isEditing) ? '' : page_config['listDescription']
-      @fill['<!--PRIMARY_CHECKED-->']           = (!@isEditing) ? 'checked' : (page_config['primaryDatabase'] == "1") ? 'checked' : ''
+      WidgetList::List.load_widget_list_yml
+      primary_is_active_record = !$widget_list_conf[:primary].to_s.include?(':/')
+      @fill['<!--PRIMARY_CHECKED-->']           = (!@isEditing) ? (primary_is_active_record ? 'checked' : '') : (page_config['primaryDatabase'] == "1") ? 'checked' : ''
+      @fill['<!--AUTH_TOKEN-->']                = ERB::Util.html_escape(WidgetList::RequestContext.csrf_token.to_s)
 
       #
       # FIELD LEVEL
@@ -188,7 +193,8 @@ module WidgetList
       @fieldFill['<!--DESC-->']                 = 'Desc'
       @fieldFill['<!--DISABLED-->']             = 'disabled'
       @fieldFill['<!--TR_STYLE-->']             = ''
-      @fill['<!--HIDDEN_FIELD_TEMPLATE-->']     = WidgetList::Utils::fill(@fieldFill , ac.render_to_string(:partial => 'widget_list/administration/field_row') )
+      @fieldFill['<!--ONBLUR1-->']              = ''
+      @fill['<!--HIDDEN_FIELD_TEMPLATE-->']     = WidgetList::Utils::fill(@fieldFill , ac.render_to_string(:partial => 'widget_list/administration/field_row', :locals => { :key_select => true }) )
       @fill['<!--ADD_HIDDEN_FIELD_BUTTON-->']   = WidgetList::Widgets::widget_button('Add Hidden Field',  {'onclick' => "AddHiddenField();", 'innerClass' => "success" } )
       @fill['<!--ALL_HIDDEN_FIELDS-->']         = (!@isEditing) ? '' : page_json['fields_hidden']
 
@@ -203,7 +209,8 @@ module WidgetList
       @fieldFill['<!--DESC-->']                 = 'Database Function'
       @fieldFill['<!--DISABLED-->']             = ''
       @fieldFill['<!--TR_STYLE-->']             = ''
-      @fill['<!--FIELD_FUNCTION_TEMPLATE-->']   = WidgetList::Utils::fill(@fieldFill , ac.render_to_string(:partial => 'widget_list/administration/field_row') )
+      @fieldFill['<!--ONBLUR1-->']              = ''
+      @fill['<!--FIELD_FUNCTION_TEMPLATE-->']   = WidgetList::Utils::fill(@fieldFill , ac.render_to_string(:partial => 'widget_list/administration/field_row', :locals => { :key_select => true }) )
       @fill['<!--ADD_FIELD_FUNCTION_BUTTON-->'] = WidgetList::Widgets::widget_button('Add Function',  {'onclick' => "AddFieldFunction();", 'innerClass' => "success" } )
       @fill['<!--ALL_FIELD_FUNCTIONS-->']       = (!@isEditing) ? '' : page_json['fields_function']
 
@@ -261,7 +268,7 @@ module WidgetList
       @fieldFill['<!--COLOR_HELP-->']           = ':column_to_show should either be the column or possibly a formatted column like CONCAT or COUNT'
       @fieldFill['<!--SUBJECT-->']              = 'drill_downs'
 
-      @fill['<!--THE_DRILL_DOWN_TEMPLATE-->']   = WidgetList::Utils::fill(@fieldFill , ac.render_to_string(:partial => 'widget_list/administration/button_row') )
+      @fill['<!--THE_DRILL_DOWN_TEMPLATE-->']   = WidgetList::Utils::fill(@fieldFill , ac.render_to_string(:partial => 'widget_list/administration/button_row', :locals => { :middle_column_select => true }) )
       @fill['<!--ADD_DRILL_DOWN_BUTTON-->']     = WidgetList::Widgets::widget_button('Add New Drill Down',  {'onclick' => "AddDrillDown();", 'innerClass' => "success" } )
       @fill['<!--ALL_DRILL_DOWNS-->']           = page_json['drill_downs']
 
@@ -278,7 +285,7 @@ module WidgetList
 
       @fieldFill = {}
       @fieldFill['<!--REMOVE_FIELD_BUTTON-->']  = remove_field_button()
-      @fieldFill['<!--FIELD_VALUE-->']          = 'column_name'
+      @fieldFill['<!--FIELD_VALUE-->']          = ''
       @fieldFill['<!--FIELD_DESC-->']           = 'User Desc'
       @fieldFill['<!--SUBJECT-->']              = 'group_by'
       @fieldFill['<!--FIELD-->']                = 'Field'
@@ -286,7 +293,7 @@ module WidgetList
       @fieldFill['<!--DISABLED-->']             = ''
       @fieldFill['<!--ONBLUR1-->']              = 'InvalidField(this)'
       @fieldFill['<!--TR_STYLE-->']             = ''
-      @fill['<!--DEFAULT_GROUPING-->']          = WidgetList::Utils::fill(@fieldFill , ac.render_to_string(:partial => 'widget_list/administration/field_row') )
+      @fill['<!--DEFAULT_GROUPING-->']          = WidgetList::Utils::fill(@fieldFill , ac.render_to_string(:partial => 'widget_list/administration/field_row', :locals => { :key_select => true }) )
       @fill['<!--ADD_GROUP_BY_BUTTON-->']       = WidgetList::Widgets::widget_button('Add New Group By',  {'onclick' => "AddGroupBy();", 'innerClass' => "success" } )
       @fill['<!--GROUPING_ITEMS-->']            = (!@isEditing) ? '' : page_json['group_by']
 
@@ -415,6 +422,7 @@ module WidgetList
       list_parms['searchFieldsOut']#{add_pointer(field[1]['column_to_show'],9)} true"
 
           column_to_show = "'#{field[1]['column_to_show'].gsub(/_linked/,'')}'"
+          data_to_pass = "'#{field[1]['data_to_pass_from_view'].gsub(/_linked/,'')}'"
           if using_grouping
             if database_type == 'oracle'
               column_to_show = "groupByFilter == 'none' ? '#{escape_code field[1]['column_to_show'].gsub(/_linked/,'')}' : 'MAX(#{escape_code field[1]['column_to_show'].gsub(/_linked/,'')})'"
@@ -425,22 +433,17 @@ module WidgetList
       list_parms['fieldFunction']#{add_pointer(field[1]['column_to_show'],7)} WidgetList::List::build_drill_down(
         :list_id => list_parms['name'],
         :drill_down_name => '#{escape_code field[0]}',
-        :data_to_pass_from_view => #{column_to_show},
+        :data_to_pass_from_view => #{data_to_pass},
         :column_to_show => #{column_to_show},
         :column_alias => '#{escape_code field[1]['column_to_show']}',
         :primary_database => #{page_config['primaryDatabase'] == '1' ? 'true' : 'false'}
       )"
-          if $is_mongo
-            code = "filterValue"
-          else
-            code = "#{page_config['view']}.sanitize(filterValue)"
-          end
           case_statements += <<-EOD
 
         when '#{field[0]}'
-          list_parms['filter']          << " #{field[1]['column_to_show'].gsub(/_linked/,'')} = ? "
-          list_parms['bindVars']        << #{code}
-          list_parms['listDescription']  = drillDownBackLink + ' Filtered by #{escape_code field[1]['column_to_show'].gsub(/_linked/,'').camelize} (' + filterValue + ')'
+          list_parms['filter']          << " #{field[1]['data_to_pass_from_view'].gsub(/_linked/,'')} = ? "
+          list_parms['bindVars']        << filterValue
+          list_parms['listDescription']  = drillDownBackLink + ' Filtered by #{escape_code field[1]['data_to_pass_from_view'].gsub(/_linked/,'').camelize} (' + filterValue + ')'
           EOD
         }
 
@@ -595,7 +598,7 @@ module WidgetList
 
       if page_config['useRansack'] == '1' && page_config['showSearch'] == '1' && $is_mongo == false
         view_code = "
-      list_parms#{add_pointer('ransackSearch',-10)} #{page_config['view']}.search(#{(WidgetList::RequestContext.request.key?('iframe')) ? 'WidgetList::RequestContext.request' : 'params'}[:q])
+      list_parms#{add_pointer('ransackSearch',-10)} #{page_config['view']}.ransack(#{(WidgetList::RequestContext.request.key?('iframe')) ? 'WidgetList::RequestContext.request' : 'params'}[:q])
       list_parms#{add_pointer('view',-10)} list_parms['ransackSearch'].result
         "
         if page_config['ransackAdvancedForm'] == '1'
@@ -622,7 +625,7 @@ module WidgetList
 
       else
         view_code = "
-      list_parms#{add_pointer('view',-10)} #{page_config['view']}
+      list_parms#{add_pointer('view',-10)} #{page_config['view']}.all
         "
       end
 
@@ -807,8 +810,6 @@ module WidgetList
       end
 
       <<-EOD
-    begin
-
       #{variable_code}
       list_parms                      = WidgetList::List::init_config()
       list_parms['name']              = '#{escape_code page_config['name']}'
@@ -849,35 +850,14 @@ module WidgetList
         when 'html'
           @output = output
         when 'json'
-          return render :inline => output
-        when 'export'
-          send_data(output, :filename => list_parms['name'] + '.csv')
-          return
-      end
-
-    rescue Exception => e
-
-      #
-      # Rescue Errors
-      #
-      Rails.logger.info e.to_s + "\\n\\n" + $!.backtrace.join("\\n\\n")
-
-      if Rails.env == 'development'
-        list_parms['errors'] << '<br/><br/><strong style="color:maroon;">(Ruby Exception - Still attempted to render list with given config ' + list_parms.inspect + ') Exception ==> ' + e.to_s + "<br/><br/>Backtrace:<br/><br/>" + $!.backtrace.join("<br/><br/>") + "</strong>"
-      end
-
-      output_type, output  = WidgetList::List.build_list(list_parms)
-
-      case output_type
-        when 'html'
-          @output = output
-        when 'json'
-          return render :inline => output
+          if WidgetList::RequestContext.request.key?('iframe')
+            @output = output
+          else
+            render json: JSON.parse(output)
+          end
         when 'export'
-          send_data(output, :filename => list_parms['name'] + '.csv')
-          return
+          send_data output, filename: list_parms['name'] + '.csv', type: 'text/csv'
       end
-    end
       EOD
     end
 
@@ -1062,7 +1042,6 @@ module WidgetList
         buttons['Edit']['class']     = 'info'
         if WidgetList::RequestContext.request.key?('ajax')
           group_by['']               = 'All ' + model_name + 's'
-          group_by['field_name']     = 'This will group by field_name and show Count'
           buttons['Delete']['url']   = '/' + controller + '/delete/' + fields.keys.first + '/'
           buttons['Edit']['url']     = '/' + controller + '/edit/' + fields.keys.first + '/'
         end
@@ -1171,7 +1150,8 @@ module WidgetList
         @fieldFill['<!--FIELD-->']               = 'Field'
         @fieldFill['<!--DISABLED-->']            = 'disabled'
         @fieldFill['<!--TR_STYLE-->']            = ''
-        @response['fields_hidden'] += WidgetList::Utils::fill(@fieldFill , ac.render_to_string(:partial => 'widget_list/administration/field_row') )
+        @fieldFill['<!--ONBLUR1-->'] = ''
+        @response['fields_hidden'] += WidgetList::Utils::fill(@fieldFill , ac.render_to_string(:partial => 'widget_list/administration/field_row', :locals => { :key_select => true }) )
       }
 
       group_by.each { |field,description|
@@ -1186,7 +1166,7 @@ module WidgetList
         @fieldFill['<!--DISABLED-->']             = ''
         @fieldFill['<!--ONBLUR1-->']              = 'InvalidField(this)'
         @fieldFill['<!--TR_STYLE-->']            = ''
-        @response['group_by'] += WidgetList::Utils::fill(@fieldFill , ac.render_to_string(:partial => 'widget_list/administration/field_row') )
+        @response['group_by'] += WidgetList::Utils::fill(@fieldFill , ac.render_to_string(:partial => 'widget_list/administration/field_row', :locals => { :key_select => true }) )
       }
 
       fields_function.each { |field,description|
@@ -1199,7 +1179,8 @@ module WidgetList
         @fieldFill['<!--FIELD-->']               = 'Field'
         @fieldFill['<!--DISABLED-->']            = ''
         @fieldFill['<!--TR_STYLE-->']            = ''
-        @response['fields_function'] += WidgetList::Utils::fill(@fieldFill , ac.render_to_string(:partial => 'widget_list/administration/field_row') )
+        @fieldFill['<!--ONBLUR1-->'] = ''
+        @response['fields_function'] += WidgetList::Utils::fill(@fieldFill , ac.render_to_string(:partial => 'widget_list/administration/field_row', :locals => { :key_select => true }) )
       }
 
       buttons.each { |field|
@@ -1249,7 +1230,7 @@ module WidgetList
         @fieldFill['<!--COLOR_HELP-->']           = ':column_to_show should either be the column or possibly a formatted column like CONCAT or COUNT'
         @fieldFill['<!--SUBJECT-->']              = 'drill_downs'
 
-        @response['drill_downs']                     +=  WidgetList::Utils::fill(@fieldFill , ac.render_to_string(:partial => 'widget_list/administration/button_row') )
+        @response['drill_downs']                     +=  WidgetList::Utils::fill(@fieldFill , ac.render_to_string(:partial => 'widget_list/administration/button_row', :locals => { :middle_column_select => true }) )
       }
 
       footer_buttons.each { |field|
@@ -1838,7 +1819,7 @@ module WidgetList
           @items['LIST_SEQUENCE'] = 1
         end
 
-        if @items['LIST_SEQUENCE'].class.name == 'Fixnum' && @items['LIST_SEQUENCE'] > 0
+        if @items['LIST_SEQUENCE'].is_a?(Integer) && @items['LIST_SEQUENCE'] > 0
           @sequence               = @items['LIST_SEQUENCE'].to_i
         end
 
@@ -2426,6 +2407,16 @@ module WidgetList
         listJumpUrl['LIST_NAME']           = @items['name']
         listJumpUrl['SQL_HASH']            = @sqlHash
 
+        # Initial links inherit request parameters in build_url. Ajax links
+        # need the preview context copied because build_url skips that step.
+        if WidgetList::RequestContext.request.key?('BUTTON_VALUE')
+          %w[iframe desiredController desiredAction].each do |key|
+            if WidgetList::RequestContext.request.key?(key)
+              listJumpUrl[key] = WidgetList::RequestContext.request[key]
+            end
+          end
+        end
+
         if WidgetList::RequestContext.request.key?('switch_grouping')
           listJumpUrl['switch_grouping'] = WidgetList::RequestContext.request['switch_grouping']
         end
@@ -3421,7 +3412,13 @@ module WidgetList
       if WidgetList::List.get_db_type(items[:primary_database]) == 'oracle'
         link = %[q'[<a style='cursor:pointer;color:#{items[:link_color]};' class='#{items[:column_alias]}_drill#{items[:column_class]}' onclick='#{items[:js_function_name]}("#{items[:drill_down_name]}", ListDrillDownGetRowValue(this) ,"#{items[:list_id]}"#{items[:extra_js_func_params]});#{items[:extra_function]}'>]' #{WidgetList::List::concat_string(items[:primary_database])}#{items[:column_to_show]}#{WidgetList::List::concat_string(items[:primary_database])}q'[</a><script class='val-db' type='text'>]' #{WidgetList::List::concat_string(items[:primary_database])} #{items[:data_to_pass_from_view]} #{WidgetList::List::concat_string(items[:primary_database])} q'[</script>]' #{WidgetList::List::concat_outer(items[:primary_database])} #{WidgetList::List::is_sequel(items[:primary_database]) ? " as #{items[:column_alias]} " : ""}]
       else
-        if WidgetList::List.get_db_type(items[:primary_database]) == 'postgres'
+        if WidgetList::List.get_db_type(items[:primary_database]) == 'sqlite'
+          sql_literal = ->(value) { "'#{value.gsub("'", "''")}'" }
+          prefix = %(<a style="cursor:pointer;color:#{items[:link_color]};" class="#{items[:column_alias]}_drill#{items[:column_class]}" onclick="#{items[:js_function_name]}('#{items[:drill_down_name]}', ListDrillDownGetRowValue(this) ,'#{items[:list_id]}'#{items[:extra_js_func_params]});#{items[:extra_function]}">)
+          middle = '</a><script class="val-db" type="text">'
+          suffix = '</script>'
+          link = "#{sql_literal.call(prefix)} || #{items[:column_to_show]} || #{sql_literal.call(middle)} || #{items[:data_to_pass_from_view]} || #{sql_literal.call(suffix)}#{WidgetList::List::is_sequel(items[:primary_database]) ? " as #{items[:column_alias]}" : ''}"
+        elsif WidgetList::List.get_db_type(items[:primary_database]) == 'postgres'
           link = %['<a style="cursor:pointer;color:#{items[:link_color]};" class="#{items[:column_alias]}_drill#{items[:column_class]}" onclick="#{items[:js_function_name]}(''#{items[:drill_down_name]}'', ListDrillDownGetRowValue(this) ,''#{items[:list_id]}''#{items[:extra_js_func_params]});#{items[:extra_function]}">"' #{WidgetList::List::concat_string(items[:primary_database])}#{items[:column_to_show]}#{WidgetList::List::concat_string(items[:primary_database])}'</a><script class="val-db" type="text">' #{WidgetList::List::concat_string(items[:primary_database])} #{items[:data_to_pass_from_view]} #{WidgetList::List::concat_string(items[:primary_database])}'</script>' #{WidgetList::List::is_sequel(items[:primary_database]) ? " as #{items[:column_alias]} " : ""}]
         else
           link = %[#{WidgetList::List::concat_inner(items[:primary_database])}"<a style='cursor:pointer;color:#{items[:link_color]};' class='#{items[:column_alias]}_drill#{items[:column_class]}' onclick='#{items[:js_function_name]}(#{WidgetList::List::double_quote(items[:primary_database])}#{items[:drill_down_name]}#{WidgetList::List::double_quote(items[:primary_database])}, ListDrillDownGetRowValue(this) ,#{WidgetList::List::double_quote(items[:primary_database])}#{items[:list_id]}#{WidgetList::List::double_quote(items[:primary_database])}#{items[:extra_js_func_params]});#{items[:extra_function]}'>"#{WidgetList::List::concat_string(items[:primary_database])}#{items[:column_to_show]}#{WidgetList::List::concat_string(items[:primary_database])}"</a><script class='val-db' type='text'>"#{WidgetList::List::concat_string(items[:primary_database])} #{items[:data_to_pass_from_view]} #{WidgetList::List::concat_string(items[:primary_database])}"</script>"#{WidgetList::List::concat_outer(items[:primary_database])} #{WidgetList::List::is_sequel(items[:primary_database]) ? " as #{items[:column_alias]} " : ""}]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: widget_list
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - David Renne
@@ -93,6 +93,20 @@ files:
 - app/views/widget_list/list_partials/_sort_column.html.erb
 - checkin_gem.sh
 - docs/legacy-readme.md
+- docs/screenshots/admin1.jpg
+- docs/screenshots/admin2.jpg
+- docs/screenshots/admin3.jpg
+- docs/screenshots/admin4.jpg
+- docs/screenshots/admin5.png
+- docs/screenshots/admin6.png
+- docs/screenshots/filtered.png
+- docs/screenshots/main.png
+- docs/screenshots/ransack1.png
+- docs/screenshots/ransack2.png
+- docs/screenshots/ransack3.png
+- docs/screenshots/search.png
+- docs/screenshots/theme_blue_sky_basin.png
+- docs/widget-list-demo-thumbnail.png
 - lib/extensions/action_controller_base.rb
 - lib/widget_list.rb
 - lib/widget_list/engine.rb