widget_list 1.3.7 → 2.0.1

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

@@ -1,13 +1,13 @@
-svn delete --force vendor/cache/widget_list-$1.gem vendor/bundle/ruby/1.9.1/cache/widget_list-$1.gem vendor/bundle/ruby/1.9.1/specifications/widget_list-$1.gemspec vendor/bundle/ruby/1.9.1/gems/widget_list-$1
+#!/usr/bin/env bash
+set -euo pipefail
 
-grep -rl '"widget_list", "'$1'"' Gemfile | xargs sed -i 's/"widget_list", "'$1'"/"widget_list", "'$2'"/g'
+cd "$(dirname "$0")"
+version=$(ruby -Ilib -rwidget_list/version -e 'print WidgetList::VERSION')
+gem build widget_list.gemspec --output "widget_list-${version}.gem"
 
-bundle install
+example_dir="../widget_list_example"
+if [[ -f "${example_dir}/bin/rails" ]]; then
+  (cd "$example_dir" && bundle install && bin/rails test)
+fi
 
-svn add vendor/cache/widget_list-$2.gem vendor/bundle/ruby/1.9.1/cache/widget_list-$2.gem vendor/bundle/ruby/1.9.1/specifications/widget_list-$2.gemspec vendor/bundle/ruby/1.9.1/gems/widget_list-$2
-
-echo -e -n  "Please test your solution and press enter to checkin new gem" 
-read THEMENAME
-
-
-svn commit vendor/cache/widget_list-$1.gem vendor/bundle/ruby/1.9.1/cache/widget_list-$1.gem vendor/bundle/ruby/1.9.1/specifications/widget_list-$1.gemspec vendor/bundle/ruby/1.9.1/gems/widget_list-$1 vendor/cache/widget_list-$2.gem vendor/bundle/ruby/1.9.1/cache/widget_list-$2.gem vendor/bundle/ruby/1.9.1/specifications/widget_list-$2.gemspec vendor/bundle/ruby/1.9.1/gems/widget_list-$2 Gemfile.lock Gemfile -m "$1 -> $2 gem update"
+printf 'Built widget_list-%s.gem. Review git diff and commit on main before publishing.\n' "$version"