Index: draggableviews.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/draggableviews/draggableviews.module,v retrieving revision 1.6.2.38 diff -u -p -r1.6.2.38 draggableviews.module --- draggableviews.module 27 Aug 2010 11:18:30 -0000 1.6.2.38 +++ draggableviews.module 4 Sep 2010 09:26:36 -0000 @@ -531,7 +531,7 @@ function draggableviews_draggableviews_s '#name' => 'draggableviews_arguments', '#options' => array('use_args' => t('Use arguments as well as view ID to order nodes.')), '#description' => t('If checked, nodes can be reordered for any set of views arguments. Use with care: If you have many combinations of arguments, your database could become very large.'), - '#default_value' => isset($current['draggableviews_arguments']) ? $current['draggableviews_arguments'] : array(), + '#default_value' => $current['draggableviews_arguments'], ); } Index: views/draggableviews_plugin_style_draggabletable.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/draggableviews/views/draggableviews_plugin_style_draggabletable.inc,v retrieving revision 1.1.2.35 diff -u -p -r1.1.2.35 draggableviews_plugin_style_draggabletable.inc --- views/draggableviews_plugin_style_draggabletable.inc 29 Jan 2010 18:49:28 -0000 1.1.2.35 +++ views/draggableviews_plugin_style_draggabletable.inc 4 Sep 2010 09:26:36 -0000 @@ -20,6 +20,19 @@ class draggableviews_plugin_style_dragga $options['override'] = array('default' => TRUE); $options['sticky'] = array('default' => FALSE); $options['order'] = array('default' => 'asc'); + $options['tabledrag_order'] = array('default' => array('field' => 'none', 'handler' => '')); + $options['tabledrag_order_visible'] = array('default' => array()); + $options['tabledrag_hierarchy'] = array('default' => array('field' => 'none', 'handler' => '')); + $options['tabledrag_hierarchy_visible'] = array('default' => array()); + $options['draggableviews_depth_limit'] = array('default' => 0); + $options['draggableviews_repair'] = array('default' => array('repair')); + $options['tabledrag_types'] = array('default' => array()); + $options['tabledrag_expand'] = array('default' => array()); + $options['draggableviews_extensions'] = array('default' => array('extension_top' => 3, 'extension_bottom' => 3)); + $options['tabledrag_lock'] = array('default' => array()); + $options['draggableviews_default_on_top'] = array('default' => TRUE); + $options['draggableviews_button_text'] = array('default' => t('Save order')); + $options['draggableviews_arguments'] = array('default' => array()); return $options; } @@ -137,11 +150,6 @@ class draggableviews_plugin_style_dragga $node_types[$node_type->type] = t($node_type->name); } - $form['tabledrag_hierarchy'] = array(); - $form['tabledrag_order'] = array(); - $form['tabledrag_types'] = array(); - $form['draggableviews_extensions'] = array(); - // Check for input. if (!empty($input['style_options'])) { // Define the input data as the current data. @@ -152,8 +160,6 @@ class draggableviews_plugin_style_dragga $current = $this->options; } - if (!isset($current['tabledrag_types'])) $current['tabledrag_types'] = array(); - $form['tabledrag_header'] = array( '#prefix' => '
', '#suffix' => '
', @@ -198,12 +204,12 @@ class draggableviews_plugin_style_dragga 'field' => array( '#type' => 'select', '#options' => array('none' => '- '. t('none') .' -') + _draggableviews_filter_fields(array('order'), $handlers), - '#default_value' => isset($current['tabledrag_order']['field']) ? $current['tabledrag_order']['field'] : 'none', + '#default_value' => $current['tabledrag_order']['field'], ), 'handler' => array( '#type' => 'select', '#options' => $draggableviews_handlers, - '#default_value' => isset($current['tabledrag_order']['handler']) ? $current['tabledrag_order']['handler'] : key($draggableviews_handlers), + '#default_value' => $current['tabledrag_order']['handler'], ), ); @@ -213,7 +219,7 @@ class draggableviews_plugin_style_dragga '#name' => 'tabledrag_order_visible', '#options' => array('visible' => t('Show input fields?')), '#title' => t('Decide whether order input fields should be visible or not'), - '#default_value' => isset($current['tabledrag_order_visible']) ? $current['tabledrag_order_visible'] : array(), + '#default_value' => $current['tabledrag_order_visible'], ); $form['tabledrag_hierarchy'] = array( @@ -221,12 +227,12 @@ class draggableviews_plugin_style_dragga 'field' => array( '#type' => 'select', '#options' => array('none' => '- '. t('none') .' -') + _draggableviews_filter_fields(array('nodereference'), $handlers), - '#default_value' => isset($current['tabledrag_hierarchy']['field']) ? $current['tabledrag_hierarchy']['field'] : 'none', + '#default_value' => $current['tabledrag_hierarchy']['field'], ), 'handler' => array( '#type' => 'select', '#options' => $draggableviews_handlers, - '#default_value' => isset($current['tabledrag_hierarchy']['handler']) ? $current['tabledrag_hierarchy']['handler'] : key($draggableviews_handlers), + '#default_value' => $current['tabledrag_hierarchy']['handler'], ), ); @@ -236,7 +242,7 @@ class draggableviews_plugin_style_dragga '#name' => 'tabledrag_hierarchy_visible', '#options' => array('visible' => t('Show input fields?')), '#title' => t('Decide whether parent input fields should be visible or not'), - '#default_value' => isset($current['tabledrag_hierarchy_visible']) ? $current['tabledrag_hierarchy_visible'] : array(), + '#default_value' => $current['tabledrag_hierarchy_visible'], ); $form['draggableviews_depth_limit'] = array( @@ -244,7 +250,7 @@ class draggableviews_plugin_style_dragga '#size' => 2, '#description' => t('Only use this option in combination with hierarchies. Type -1 for no limit.'), '#title' => t('Define the depth limit'), - '#default_value' => (isset($current['draggableviews_depth_limit']) && is_numeric($current['draggableviews_depth_limit'])) ? $current['draggableviews_depth_limit'] : -1, + '#default_value' => $current['draggableviews_depth_limit'], ); // Lock option. @@ -253,7 +259,7 @@ class draggableviews_plugin_style_dragga '#options' => array('repair' => t('Repair broken structures.')), '#description' => t('Uncheck this option if you don\'t want DraggableViews to repair broken structures.'), '#title' => t('Structure'), - '#default_value' => isset($current['draggableviews_repair']) ? $current['draggableviews_repair'] : array('repair'), + '#default_value' => $current['draggableviews_repair'], ); if (strcmp($this->view->base_table, 'node') == 0) { @@ -298,7 +304,7 @@ class draggableviews_plugin_style_dragga '#name' => 'tabledrag_expand', '#options' => array('expand_links' => 'Show expand Links', 'collapsed' => 'Default is collapsed', 'by_uid' => 'Unique for each user'), '#title' => t('Decide whether expand/collapse links should be shown or not'), - '#default_value' => isset($current['tabledrag_expand']) ? $current['tabledrag_expand'] : array('expand_links'), + '#default_value' => $current['tabledrag_expand'], ); // Extensions when using paging. @@ -307,13 +313,13 @@ class draggableviews_plugin_style_dragga '#type' => 'textfield', '#size' => 2, '#title' => t('How many rows should be displayed of the previous page'), - '#default_value' => (isset($current['draggableviews_extensions']['extension_top']) && is_numeric($current['draggableviews_extensions']['extension_top'])) ? $current['draggableviews_extensions']['extension_top'] : 3, + '#default_value' => $current['draggableviews_extensions']['extension_top'], ), 'extension_bottom' => array( '#type' => 'textfield', '#size' => 2, '#title' => t('How many rows should be displayed of the next page'), - '#default_value' => (isset($current['draggableviews_extensions']['extension_bottom']) && is_numeric($current['draggableviews_extensions']['extension_bottom'])) ? $current['draggableviews_extensions']['extension_bottom'] : 3, + '#default_value' => $current['draggableviews_extensions']['extension_bottom'], ), ); @@ -323,14 +329,14 @@ class draggableviews_plugin_style_dragga '#name' => 'tabledrag_lock', '#options' => array('lock' => t('The user cannot rearrange nodes (locked)')), '#title' => t('Lock'), - '#default_value' => isset($current['tabledrag_lock']) ? $current['tabledrag_lock'] : array(), + '#default_value' => $current['tabledrag_lock'], ); $form['draggableviews_default_on_top'] = array( '#type' => 'radios', '#name' => 'draggableviews_default_on_top', '#title' => t('Behaviour of new nodes'), - '#default_value' => isset($current['draggableviews_default_on_top']) ? $current['draggableviews_default_on_top'] : 1, + '#default_value' => $current['draggableviews_default_on_top'], '#description' => t('Nodes without a numerical order value assigned will be treated as new nodes. Decide where they should appear by default.'), '#options' => array(t('On Bottom'), t('On Top')), ); @@ -340,7 +346,7 @@ class draggableviews_plugin_style_dragga '#size' => 20, '#title' => t('The label of the save button'), '#description' => t('Make the workflow more intuitive for the user.'), - '#default_value' => isset($current['draggableviews_button_text']) ? $current['draggableviews_button_text'] : t('Save order'), + '#default_value' => $current['draggableviews_button_text'], ); // Let extension modules alter the output