widget_list 1.0.8 → 1.0.9

data/README.md

@@ -277,7 +277,7 @@ Style a row based on the value of the column.
 
     begin
 
-      list_parms   = {}
+      list_parms   = WidgetList::List::init_config()
 
       #
       # Give it a name, some SQL to feed widget_list and set a noDataMessage

data/lib/widget_list.rb

@@ -29,139 +29,7 @@ module WidgetList
 
       # Defaults for all configs
       # See https://github.com/davidrenne/widget_list/blob/master/README.md#feature-configurations
-      @items = {
-        'errors'              => [],
-        'name'                => ([*('A'..'Z'),*('0'..'9')]-%w(0 1 I O)).sample(16).join,
-        'database'            => 'primary', #
-        'title'               => '',
-        'listDescription'     => '',
-        'pageId'              => $_SERVER['PATH_INFO'],
-        'view'                => '',
-        'data'                => {},
-        'collClass'           => '',
-        'collAlign'           => '',
-        'fields'              => {},
-        'fieldsHidden'        => [],
-        'bindVars'            => [],
-        'bindVarsLegacy'      => {},
-        'links'               => {},
-        'buttons'             => {},
-        'inputs'              => {},
-        'filter'              => [],
-        'groupBy'             => '',
-        'rowStart'            => 0,
-        'rowLimit'            => 10,
-        'orderBy'             => '',
-        'allowHTML'           => true,
-        'searchClear'         => false,
-        'searchClearAll'      => false,
-        'showPagination'      => true,
-        'searchSession'       => true,
-
-        #
-        # carryOverRequests will allow you to post custom things from request to all sort/paging URLS for each ajax
-        #
-        'carryOverRequsts'    => ['switch_grouping'],
-
-        #
-        # Head/Foot
-        #
-
-        'customFooter'        => '',
-        'customHeader'        => '',
-
-        #
-        # Ajax
-        #
-        'ajaxFunctionAll'   => '',
-        'ajaxFunction'       => 'ListJumpMin',
-
-        #
-        #  Search
-        #
-        'showSearch'          => true,
-        'searchOnkeyup'       => '',
-        'searchOnclick'       => '',
-        'searchIdCol'         => 'id',
-        'searchTitle'         => 'Search by Id or a list of Ids and more',
-        'searchFieldsIn'      => {},
-        'searchFieldsOut'     => {'id'=>true},
-        'templateFilter'      => '',
-
-        #
-        #  Export
-        #
-        'showExport'          => true,
-        'exportButtonTitle'   => 'Export CSV',
-
-        #
-        # Group By Box
-        #
-        'groupByItems'        => [],
-        'groupBySelected'     => false,
-        'groupByLabel'        => 'Group By',
-        'groupByClick'        => '',
-        'groupByClickDefault' => "ListChangeGrouping('<!--NAME-->', this);",
-
-
-        #
-        # Advanced searching
-        #
-        'listSearchForm'    => '',
-
-        #
-        # Column Specific
-        #
-        'columnStyle'         => {},
-        'columnClass'         => {},
-        'columnPopupTitle'    => {},
-        'columnSort'          => {},
-        'columnWidth'         => {},
-        'columnNoSort'        => {},
-
-        #
-        # Column Border (on right)
-        #
-        'borderedColumns'     => false,
-        'borderColumnStyle'   => '1px solid #CCCCCC',
-
-        #
-        # Row specifics
-        #
-        'rowClass'            => '',
-        'rowColorByStatus'    => {},
-        'rowStylesByStatus'   => {},
-        'rowOffsets'          => ['FFFFFF','FFFFFF'],
-
-        'class'               => 'listContainerPassive',
-        'tableclass'          => 'tableBlowOutPreventer',
-        'noDataMessage'       => 'Currently no data.',
-        'useSort'             => true,
-        'headerClass'         => {},
-        'fieldFunction'       => {},
-        'buttonVal'           => 'templateListJump',
-        'linkFunction'        => 'ButtonLinkPost',
-        'template'            => '',
-        'LIST_COL_SORT_ORDER' => 'ASC',
-        'LIST_COL_SORT'       => '',
-        'LIST_FILTER_ALL'     => '',
-        'ROW_LIMIT'           => '',
-        'LIST_SEQUENCE'       => 1,
-        'NEW_SEARCH'          => false,
-
-        #
-        # Checkbox
-        #
-        'checkedClass'       => 'widgetlist-checkbox',
-        'checkedFlag'        => {},
-        'storeSessionChecks' => false,
-
-        #
-        # Hooks
-        #
-        'columnHooks'        => {},
-        'rowHooks'           => {}
-      }
+      @items        = WidgetList::List::get_defaults()
 
       @csv          = []
       @csv          << []
@@ -337,27 +205,27 @@ module WidgetList
 
         #Ajax ListJump
         if ! $_REQUEST.empty?
-          if $_REQUEST.key?('LIST_FILTER_ALL')
+          if $_REQUEST.key?('LIST_FILTER_ALL') && !$_REQUEST['LIST_FILTER_ALL'].empty?
             @items['LIST_FILTER_ALL']     = $_REQUEST['LIST_FILTER_ALL']
             @isJumpingList = true
           end
 
-          if $_REQUEST.key?('LIST_COL_SORT')
+          if $_REQUEST.key?('LIST_COL_SORT') && !$_REQUEST['LIST_COL_SORT'].empty?
             @items['LIST_COL_SORT']     = $_REQUEST['LIST_COL_SORT']
             @isJumpingList = true
           end
 
-          if $_REQUEST.key?('LIST_COL_SORT_ORDER')
+          if $_REQUEST.key?('LIST_COL_SORT_ORDER') && !$_REQUEST['LIST_COL_SORT_ORDER'].empty?
             @items['LIST_COL_SORT_ORDER']     = $_REQUEST['LIST_COL_SORT_ORDER']
             @isJumpingList = true
           end
 
-          if $_REQUEST.key?('LIST_SEQUENCE')
+          if $_REQUEST.key?('LIST_SEQUENCE') && !$_REQUEST['LIST_SEQUENCE'].empty?
             @items['LIST_SEQUENCE']     = $_REQUEST['LIST_SEQUENCE'].to_i
             @isJumpingList = true
           end
 
-          if $_REQUEST.key?('ROW_LIMIT')
+          if $_REQUEST.key?('ROW_LIMIT') && !$_REQUEST['ROW_LIMIT'].empty?
             @items['ROW_LIMIT']     = $_REQUEST['ROW_LIMIT']
             @isJumpingList = true
 
@@ -619,6 +487,152 @@ module WidgetList
       end
     end
 
+    def self.get_defaults()
+      {
+        'errors'              => [],
+        'name'                => ([*('A'..'Z'),*('0'..'9')]-%w(0 1 I O)).sample(16).join,
+        'database'            => 'primary', #
+        'title'               => '',
+        'listDescription'     => '',
+        'pageId'              => $_SERVER['PATH_INFO'],
+        'view'                => '',
+        'data'                => {},
+        'collClass'           => '',
+        'collAlign'           => '',
+        'fields'              => {},
+        'fieldsHidden'        => [],
+        'bindVars'            => [],
+        'bindVarsLegacy'      => {},
+        'links'               => {},
+        'buttons'             => {},
+        'inputs'              => {},
+        'filter'              => [],
+        'groupBy'             => '',
+        'rowStart'            => 0,
+        'rowLimit'            => 10,
+        'orderBy'             => '',
+        'allowHTML'           => true,
+        'searchClear'         => false,
+        'searchClearAll'      => false,
+        'showPagination'      => true,
+        'searchSession'       => true,
+
+        #
+        # carryOverRequests will allow you to post custom things from request to all sort/paging URLS for each ajax
+        #
+        'carryOverRequsts'    => ['switch_grouping'],
+
+        #
+        # Head/Foot
+        #
+
+        'customFooter'        => '',
+        'customHeader'        => '',
+
+        #
+        # Ajax
+        #
+        'ajaxFunctionAll'     => '',
+        'ajaxFunction'        => 'ListJumpMin',
+
+        #
+        #  Search
+        #
+        'showSearch'          => true,
+        'searchOnkeyup'       => '',
+        'searchOnclick'       => '',
+        'searchIdCol'         => 'id',
+        'searchTitle'         => 'Search by Id or a list of Ids and more',
+        'searchFieldsIn'      => {},
+        'searchFieldsOut'     => {'id'=>true},
+        'templateFilter'      => '',
+
+        #
+        #  Export
+        #
+        'showExport'          => true,
+        'exportButtonTitle'   => 'Export CSV',
+
+        #
+        # Group By Box
+        #
+        'groupByItems'        => [],
+        'groupBySelected'     => false,
+        'groupByLabel'        => 'Group By',
+        'groupByClick'        => '',
+        'groupByClickDefault' => "ListChangeGrouping('<!--NAME-->', this);",
+
+
+        #
+        # Advanced searching
+        #
+        'listSearchForm'      => '',
+
+        #
+        # Column Specific
+        #
+        'columnStyle'         => {},
+        'columnClass'         => {},
+        'columnPopupTitle'    => {},
+        'columnSort'          => {},
+        'columnWidth'         => {},
+        'columnNoSort'        => {},
+
+        #
+        # Column Border (on right)
+        #
+        'borderedColumns'     => false,
+        'borderColumnStyle'   => '1px solid #CCCCCC',
+
+        #
+        # Row specifics
+        #
+        'rowClass'            => '',
+        'rowColorByStatus'    => {},
+        'rowStylesByStatus'   => {},
+        'rowOffsets'          => ['FFFFFF','FFFFFF'],
+
+        'class'               => 'listContainerPassive',
+        'tableclass'          => 'tableBlowOutPreventer',
+        'noDataMessage'       => 'Currently no data.',
+        'useSort'             => true,
+        'headerClass'         => {},
+        'fieldFunction'       => {},
+        'buttonVal'           => 'templateListJump',
+        'linkFunction'        => 'ButtonLinkPost',
+        'template'            => '',
+        'LIST_COL_SORT_ORDER' => 'ASC',
+        'LIST_COL_SORT'       => '',
+        'LIST_FILTER_ALL'     => '',
+        'ROW_LIMIT'           => '',
+        'LIST_SEQUENCE'       => 1,
+        'NEW_SEARCH'          => false,
+
+        #
+        # Checkbox
+        #
+        'checkedClass'        => 'widgetlist-checkbox',
+        'checkedFlag'         => {},
+        'storeSessionChecks'  => false,
+
+        #
+        # Hooks
+        #
+        'columnHooks'         => {},
+        'rowHooks'            => {}
+      }
+    end
+
+    def self.init_config()
+      list_parms = {}
+      WidgetList::List::get_defaults.each { |k,v|
+        if (v.is_a?(Array) || v.is_a?(Hash)) && v.empty?
+          list_parms[k] = v
+        end
+      }
+      return list_parms
+    end
+
     def skip_column(fieldName)
       skip = false
       (@items['inputs']||{}).each { |k,v|
@@ -916,6 +930,9 @@ module WidgetList
           if ! @items['templateFilter'].empty?
             @templateFill['<!--FILTER_HEADER-->']    = @items['templateFilter']
           else
+
+            @templateFill['<!--FILTER_HEADER-->'] = ''
+
             if !$_REQUEST.key?('search_filter') && !@isJumpingList
 
               #Search page url
@@ -1029,11 +1046,12 @@ module WidgetList
               end
               @templateFill['<!--FILTER_HEADER-->']  += '<div class="fake-select"><div class="label">' + @items['groupByLabel'] + ':</div> ' + WidgetList::Widgets::widget_input(list_group) + '</div>'
 
-              if @items['showExport']
-                @templateFill['<!--FILTER_HEADER-->']  +=  WidgetList::Widgets::widget_button(@items['exportButtonTitle'], {'onclick' => 'ListExport(\'' + @items['name'] + '\');'}, true)
-              end
+            end
 
+            if @items['showExport']
+              @templateFill['<!--FILTER_HEADER-->']  +=  WidgetList::Widgets::widget_button(@items['exportButtonTitle'], {'onclick' => 'ListExport(\'' + @items['name'] + '\');'}, true)
             end
+
           end
         end
 
@@ -1489,6 +1507,17 @@ module WidgetList
             input['value'] = @results[ input['value'].upcase ][row]
           end
 
+          if input.key?('disabled_if') && input['disabled_if'].class.name == 'Proc'
+            row_tmp = {}
+            @results.map { |column| column }.each { |col|
+              row_tmp[ col[0] ] = col[1][row]
+            }
+
+            if input['disabled_if'].call(row_tmp)
+              input['disabled'] = true
+            end
+          end
+
           #
           # Append class handle
           #
@@ -1695,7 +1724,7 @@ module WidgetList
     end
 
     def self.build_drill_down_link(listId,drillDownName,dataToPassFromView,columnToShow,columnAlias='',extraFunction='',functionName='ListDrillDown',columnClass='',color='blue',extraJSFunctionParams='',primary=true)
-      warn "`build_drill_down_link` is deprecated. Use `build_drill_down` instead."
+      ActiveSupport::Deprecation.warn "`build_drill_down_link` is deprecated. Use `build_drill_down` instead."
       if columnAlias.empty?
         columnAlias = columnToShow
       end
@@ -2206,14 +2235,10 @@ module WidgetList
 
       if !@items['LIST_COL_SORT'].empty? || ($_SESSION.key?('LIST_COL_SORT') && $_SESSION['LIST_COL_SORT'].class.name == 'Hash' && $_SESSION['LIST_COL_SORT'].key?(@sqlHash))
         if ! @items['LIST_COL_SORT'].empty?
-          if @items['fields'].key?(@items['LIST_COL_SORT'])
-            pieces['<!--ORDERBY-->'] += ' ORDER BY ' + tick_field() + @items['LIST_COL_SORT'] + tick_field() + " " + @items['LIST_COL_SORT_ORDER']
-          end
+          pieces['<!--ORDERBY-->'] += ' ORDER BY ' + tick_field() + @items['LIST_COL_SORT'] + tick_field() + " " + @items['LIST_COL_SORT_ORDER']
         else
           $_SESSION['LIST_COL_SORT'][@sqlHash].each_with_index { |order,void|
-            if @items['fields'].key?(order[0])
-              pieces['<!--ORDERBY-->'] += ' ORDER BY ' + tick_field() + order[0] + tick_field() +  " " + order[1]
-            end
+            pieces['<!--ORDERBY-->'] += ' ORDER BY ' + tick_field() + order[0] + tick_field() +  " " + order[1]
           } if $_SESSION.key?('LIST_COL_SORT') && $_SESSION['LIST_COL_SORT'].class.name == 'Hash' && $_SESSION['LIST_COL_SORT'].key?(@sqlHash)
         end
 

data/lib/widget_list/sequel.rb

@@ -94,6 +94,10 @@ module Sequel
       sql
     end
 
+    def _get_row_value(row,fieldName)
+      row.send(fieldName).to_s
+    end
+
     # @param [Object or String] sql_or_obj
     #                           will either take raw SQL or a Sequel object
     # @param [Array]            bind
@@ -145,7 +149,7 @@ module Sequel
               if first == 1
                 @final_results[fieldName.to_s.upcase] = []
               end
-              @final_results[fieldName.to_s.upcase] << ((row.send(fieldName).nil?) ? '' : row.send(fieldName))
+              @final_results[fieldName.to_s.upcase] << ((row.send(fieldName).nil? && row.attributes[fieldName].nil?) ? '' : _get_row_value(row,fieldName))
             }
             first = 0
           }

data/lib/widget_list/tpl.rb

@@ -47,7 +47,7 @@ $G_TEMPLATE.deep_merge!({'widget' =>
                            {'checkbox'=>
                               {'default' =>
                                  '
-<input type="checkbox" class="<!--INPUT_CLASS-->" style="<!--INPUT_STYLE-->" id="<!--ID-->" name="<!--NAME-->" value="<!--VALUE-->" onclick="<!--ONCLICK-->" <!--CHECKED-->>
+<input type="checkbox" class="<!--INPUT_CLASS-->" style="<!--INPUT_STYLE-->" id="<!--ID-->" name="<!--NAME-->" value="<!--VALUE-->" onclick="<!--ONCLICK-->" <!--CHECKED-->  <!--DISABLED-->>
 <!--REQUIRED-->'
                               }
                            }

data/lib/widget_list/version.rb

@@ -1,3 +1,3 @@
 module WidgetList
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

data/lib/widget_list/widgets.rb

@@ -42,8 +42,10 @@ module WidgetList
         items['input_class'] = items['class']
       end
 
-      if !items['disabled']
-        items['input_class'] += ' disabled'
+      if items['disabled']
+        items['disabled']     = 'disabled'
+      else        
+        items['disabled']     = ''
       end
 
       if items['hidden'] == true
@@ -60,7 +62,8 @@ module WidgetList
         '<!--VALUE-->'       => items['value'],
         '<!--REQUIRED-->'    => items['template_required'],
         '<!--CHECKED-->'     => items['checked'],
-        '<!--VALUE-->'       => items['value']
+        '<!--VALUE-->'       => items['value'],
+        '<!--DISABLED-->'    => items['disabled']
       }
 
       return WidgetList::Utils::fill(pieces, items['template'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: widget_list
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel