|
@@ -38,7 +38,7 @@ discard block |
|
|
block discarded – undo |
|
38
|
38
|
|
|
39
|
39
|
$this->label = esc_html__( 'Number Sequence', 'gravityview' ); |
|
40
|
40
|
|
|
41
|
|
- add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'field_tooltips') ); |
|
|
41
|
+ add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'field_tooltips' ) ); |
|
42
|
42
|
|
|
43
|
43
|
parent::__construct(); |
|
44
|
44
|
} |
|
@@ -52,9 +52,9 @@ discard block |
|
|
block discarded – undo |
|
52
|
52
|
|
|
53
|
53
|
$return = $tooltips; |
|
54
|
54
|
|
|
55
|
|
- $return['reverse_sequence'] = array( |
|
56
|
|
- 'title' => __('Reverse the order of the result numbers', 'gravityview'), |
|
57
|
|
- 'value' => __('Output row numbers in descending order. If enabled, numbers will count down from high to low.', 'gravityview'), |
|
|
55
|
+ $return[ 'reverse_sequence' ] = array( |
|
|
56
|
+ 'title' => __( 'Reverse the order of the result numbers', 'gravityview' ), |
|
|
57
|
+ 'value' => __( 'Output row numbers in descending order. If enabled, numbers will count down from high to low.', 'gravityview' ), |
|
58
|
58
|
); |
|
59
|
59
|
|
|
60
|
60
|
return $return; |
|
@@ -62,13 +62,13 @@ discard block |
|
|
block discarded – undo |
|
62
|
62
|
|
|
63
|
63
|
public function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
|
64
|
64
|
|
|
65
|
|
- unset ( $field_options['search_filter'] ); |
|
|
65
|
+ unset ( $field_options[ 'search_filter' ] ); |
|
66
|
66
|
|
|
67
|
67
|
$new_fields = array( |
|
68
|
68
|
'start' => array( |
|
69
|
69
|
'type' => 'number', |
|
70
|
70
|
'label' => __( 'First Number in the Sequence', 'gravityview' ), |
|
71
|
|
- 'desc' => __('For each entry, the displayed number will increase by one. When displaying ten entries, the first entry will display "1", and the last entry will show "10".', 'gravityview'), |
|
|
71
|
+ 'desc' => __( 'For each entry, the displayed number will increase by one. When displaying ten entries, the first entry will display "1", and the last entry will show "10".', 'gravityview' ), |
|
72
|
72
|
'value' => '1', |
|
73
|
73
|
'merge_tags' => false, |
|
74
|
74
|
), |
|
@@ -114,20 +114,20 @@ discard block |
|
|
block discarded – undo |
|
114
|
114
|
$return = $text; |
|
115
|
115
|
|
|
116
|
116
|
$context = new \GV\Template_Context(); |
|
117
|
|
- $context->view = \GV\View::by_id( $view_data['view_id'] ); |
|
|
117
|
+ $context->view = \GV\View::by_id( $view_data[ 'view_id' ] ); |
|
118
|
118
|
$context->entry = \GV\GF_Entry::from_entry( $entry ); |
|
119
|
119
|
|
|
120
|
120
|
$legacy_field = \GravityView_View::getInstance()->getCurrentField(); // TODO: Don't use legacy code... |
|
121
|
121
|
|
|
122
|
122
|
$gv_field = \GV\Internal_Field::by_id( 'sequence' ); |
|
123
|
|
- $merge_tag_context = $legacy_field['UID']; |
|
|
123
|
+ $merge_tag_context = $legacy_field[ 'UID' ]; |
|
124
|
124
|
|
|
125
|
125
|
$merge_tag_context = uniqid( 'sequence_', true ) . "/$merge_tag_context"; |
|
126
|
126
|
|
|
127
|
127
|
foreach ( $matches as $match ) { |
|
128
|
128
|
|
|
129
|
|
- $full_tag = $match[0]; |
|
130
|
|
- $property = $match[1]; |
|
|
129
|
+ $full_tag = $match[ 0 ]; |
|
|
130
|
+ $property = $match[ 1 ]; |
|
131
|
131
|
|
|
132
|
132
|
$gv_field->reverse = false; |
|
133
|
133
|
$gv_field->start = 1; |
|
@@ -146,12 +146,12 @@ discard block |
|
|
block discarded – undo |
|
146
|
146
|
|
|
147
|
147
|
// If there is a field with the ID of the start number, the merge tag won't work. |
|
148
|
148
|
// In that case, you can use "=" instead: `{sequence start=10}` |
|
149
|
|
- if( 1 === sizeof( $maybe_start ) ) { |
|
|
149
|
+ if ( 1 === sizeof( $maybe_start ) ) { |
|
150
|
150
|
$maybe_start = explode( '=', $modifier ); |
|
151
|
151
|
} |
|
152
|
152
|
|
|
153
|
153
|
if ( 'start' === rgar( $maybe_start, 0 ) && is_numeric( rgar( $maybe_start, 1 ) ) ) { |
|
154
|
|
- $gv_field->start = (int) rgar( $maybe_start, 1 ); |
|
|
154
|
+ $gv_field->start = (int)rgar( $maybe_start, 1 ); |
|
155
|
155
|
} |
|
156
|
156
|
} |
|
157
|
157
|
|
|
@@ -162,7 +162,7 @@ discard block |
|
|
block discarded – undo |
|
162
|
162
|
$merge_tag_context_modifiers = $merge_tag_context . '/' . var_export( $gv_field->reverse, true ) . '/' . $gv_field->start; |
|
163
|
163
|
|
|
164
|
164
|
if ( ! isset( $merge_tag_sequences[ $merge_tag_context_modifiers ] ) ) { |
|
165
|
|
- $gv_field->UID = $legacy_field['UID'] . '/' . var_export( $gv_field->reverse, true ) . '/' . $gv_field->start; |
|
|
165
|
+ $gv_field->UID = $legacy_field[ 'UID' ] . '/' . var_export( $gv_field->reverse, true ) . '/' . $gv_field->start; |
|
166
|
166
|
$context->field = $gv_field; |
|
167
|
167
|
$sequence = $merge_tag_sequences[ $merge_tag_context_modifiers ] = $this->get_sequence( $context ); |
|
168
|
168
|
} else { |
|
@@ -207,7 +207,7 @@ discard block |
|
|
block discarded – undo |
|
207
|
207
|
$total = $context->view->get_entries()->total(); |
|
208
|
208
|
remove_filter( 'gform_gf_query_sql', $callback ); |
|
209
|
209
|
|
|
210
|
|
- unset( $sql_query['paginate'] ); |
|
|
210
|
+ unset( $sql_query[ 'paginate' ] ); |
|
211
|
211
|
|
|
212
|
212
|
global $wpdb; |
|
213
|
213
|
|
gravityview /
GravityView
