@@ -19,8 +19,8 @@ discard block |
||
19 | 19 | |
20 | 20 | |
21 | 21 | /** |
22 | - * Constructor. Add filters to modify output. |
|
23 | - * |
|
22 | + * Constructor. Add filters to modify output. |
|
23 | + * |
|
24 | 24 | * @since 2.0.4 |
25 | 25 | * |
26 | 26 | * @param View $view |
@@ -29,19 +29,19 @@ discard block |
||
29 | 29 | */ |
30 | 30 | public function __construct( View $view, Entry_Collection $entries, Request $request ) { |
31 | 31 | |
32 | - add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 ); |
|
32 | + add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 ); |
|
33 | 33 | |
34 | 34 | parent::__construct( $view, $entries, $request ); |
35 | 35 | } |
36 | 36 | |
37 | 37 | /** |
38 | - * Add sorting links to HTML columns that support sorting |
|
39 | - * |
|
40 | - * @since 2.0.4 |
|
41 | - * @since 2.0.5 Made static |
|
42 | - * |
|
43 | - * @static |
|
44 | - * |
|
38 | + * Add sorting links to HTML columns that support sorting |
|
39 | + * |
|
40 | + * @since 2.0.4 |
|
41 | + * @since 2.0.5 Made static |
|
42 | + * |
|
43 | + * @static |
|
44 | + * |
|
45 | 45 | * @param string $column_label Label for the table column |
46 | 46 | * @param \GV\Template_Context $context |
47 | 47 | * |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | $sort_columns = $context->view->settings->get( 'sort_columns' ); |
53 | 53 | |
54 | 54 | if ( empty( $sort_columns ) ) { |
55 | - return $column_label; |
|
55 | + return $column_label; |
|
56 | 56 | } |
57 | 57 | |
58 | 58 | if ( ! \GravityView_frontend::getInstance()->is_field_sortable( $context->field->ID, $context->view->form->form ) ) { |
@@ -102,22 +102,22 @@ discard block |
||
102 | 102 | // If we are already sorting by the current field... |
103 | 103 | if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) { |
104 | 104 | |
105 | - switch( $sorting['direction'] ) { |
|
106 | - // No sort |
|
107 | - case '': |
|
108 | - $sort_args[1] = 'asc'; |
|
109 | - $class .= ' gv-icon-caret-up-down'; |
|
110 | - break; |
|
111 | - case 'desc': |
|
112 | - $sort_args[1] = ''; |
|
113 | - $class .= ' gv-icon-sort-asc'; |
|
114 | - break; |
|
115 | - case 'asc': |
|
116 | - default: |
|
117 | - $sort_args[1] = 'desc'; |
|
118 | - $class .= ' gv-icon-sort-desc'; |
|
119 | - break; |
|
120 | - } |
|
105 | + switch( $sorting['direction'] ) { |
|
106 | + // No sort |
|
107 | + case '': |
|
108 | + $sort_args[1] = 'asc'; |
|
109 | + $class .= ' gv-icon-caret-up-down'; |
|
110 | + break; |
|
111 | + case 'desc': |
|
112 | + $sort_args[1] = ''; |
|
113 | + $class .= ' gv-icon-sort-asc'; |
|
114 | + break; |
|
115 | + case 'asc': |
|
116 | + default: |
|
117 | + $sort_args[1] = 'desc'; |
|
118 | + $class .= ' gv-icon-sort-desc'; |
|
119 | + break; |
|
120 | + } |
|
121 | 121 | |
122 | 122 | } else { |
123 | 123 | $class .= ' gv-icon-caret-up-down'; |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | $url = remove_query_arg( 'sort', $url ); |
128 | 128 | $multisort_url = self::_get_multisort_url( $url, $sort_args, $context->field->ID ); |
129 | 129 | |
130 | - $url = add_query_arg( $sort_args[0], $sort_args[1], $url ); |
|
130 | + $url = add_query_arg( $sort_args[0], $sort_args[1], $url ); |
|
131 | 131 | |
132 | 132 | $return = '<a href="'. esc_url_raw( $url ) .'"'; |
133 | 133 | |
@@ -141,50 +141,50 @@ discard block |
||
141 | 141 | } |
142 | 142 | |
143 | 143 | /** |
144 | - * Get the multi-sort URL used in the sorting links |
|
145 | - * |
|
146 | - * @todo Consider moving to Utils? |
|
147 | - * |
|
148 | - * @since 2.3 |
|
149 | - * |
|
150 | - * @see add_columns_sort_links |
|
144 | + * Get the multi-sort URL used in the sorting links |
|
145 | + * |
|
146 | + * @todo Consider moving to Utils? |
|
147 | + * |
|
148 | + * @since 2.3 |
|
149 | + * |
|
150 | + * @see add_columns_sort_links |
|
151 | 151 | * @param string $url Single-sort URL |
152 | 152 | * @param array $sort_args Single sorting for rules, in [ field_id, dir ] format |
153 | - * @param string|int $field_id ID of the current field being displayed |
|
154 | - * |
|
155 | - * @return string Multisort URL, if there are multiple sorts. Otherwise, existing $url |
|
153 | + * @param string|int $field_id ID of the current field being displayed |
|
154 | + * |
|
155 | + * @return string Multisort URL, if there are multiple sorts. Otherwise, existing $url |
|
156 | 156 | */ |
157 | 157 | static public function _get_multisort_url( $url, $sort_args, $field_id ) { |
158 | 158 | |
159 | 159 | $sorts = Utils::_GET( 'sort' ); |
160 | 160 | |
161 | 161 | if ( ! is_array( $sorts ) ) { |
162 | - return $url; |
|
162 | + return $url; |
|
163 | 163 | } |
164 | 164 | |
165 | - $multisort_url = $url; |
|
165 | + $multisort_url = $url; |
|
166 | 166 | |
167 | 167 | // If the field has already been sorted by, add the field to the URL |
168 | - if ( ! in_array( $field_id, $keys = array_keys( $sorts ) ) ) { |
|
169 | - if ( count( $keys ) ) { |
|
170 | - $multisort_url = add_query_arg( sprintf( 'sort[%s]', end( $keys ) ), $sorts[ end( $keys ) ], $multisort_url ); |
|
171 | - $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
172 | - } else { |
|
173 | - $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
174 | - } |
|
175 | - } |
|
176 | - // Otherwise, we are just updating the sort order |
|
177 | - else { |
|
178 | - |
|
179 | - // Pass empty value to unset |
|
180 | - if( '' === $sort_args[1] ) { |
|
181 | - unset( $sorts[ $field_id ] ); |
|
182 | - } else { |
|
183 | - $sorts[ $field_id ] = $sort_args[1]; |
|
184 | - } |
|
185 | - |
|
186 | - $multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url ); |
|
187 | - } |
|
168 | + if ( ! in_array( $field_id, $keys = array_keys( $sorts ) ) ) { |
|
169 | + if ( count( $keys ) ) { |
|
170 | + $multisort_url = add_query_arg( sprintf( 'sort[%s]', end( $keys ) ), $sorts[ end( $keys ) ], $multisort_url ); |
|
171 | + $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
172 | + } else { |
|
173 | + $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url ); |
|
174 | + } |
|
175 | + } |
|
176 | + // Otherwise, we are just updating the sort order |
|
177 | + else { |
|
178 | + |
|
179 | + // Pass empty value to unset |
|
180 | + if( '' === $sort_args[1] ) { |
|
181 | + unset( $sorts[ $field_id ] ); |
|
182 | + } else { |
|
183 | + $sorts[ $field_id ] = $sort_args[1]; |
|
184 | + } |
|
185 | + |
|
186 | + $multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url ); |
|
187 | + } |
|
188 | 188 | |
189 | 189 | return $multisort_url; |
190 | 190 | } |
@@ -214,10 +214,10 @@ discard block |
||
214 | 214 | } |
215 | 215 | |
216 | 216 | /** |
217 | - * Returns the label for a column, with support for all deprecated filters |
|
218 | - * |
|
219 | - * @since 2.1 |
|
220 | - * |
|
217 | + * Returns the label for a column, with support for all deprecated filters |
|
218 | + * |
|
219 | + * @since 2.1 |
|
220 | + * |
|
221 | 221 | * @param \GV\Field $field |
222 | 222 | * @param \GV\Template_Context $context |
223 | 223 | */ |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | $column_label = apply_filters( 'gravityview/template/field/label', $column_label, $context ); |
241 | 241 | |
242 | 242 | return $column_label; |
243 | - } |
|
243 | + } |
|
244 | 244 | |
245 | 245 | /** |
246 | 246 | * Output the entry row. |
@@ -309,15 +309,15 @@ discard block |
||
309 | 309 | */ |
310 | 310 | do_action( 'gravityview/template/table/cells/before', $context ); |
311 | 311 | |
312 | - /** |
|
313 | - * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells. |
|
314 | - * @since 1.0.7 |
|
312 | + /** |
|
313 | + * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells. |
|
314 | + * @since 1.0.7 |
|
315 | 315 | * @param \GravityView_View $this Current GravityView_View object |
316 | 316 | * @deprecated Use `gravityview/template/table/cells/before` |
317 | - */ |
|
318 | - do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() ); |
|
317 | + */ |
|
318 | + do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() ); |
|
319 | 319 | |
320 | - foreach ( $fields->all() as $field ) { |
|
320 | + foreach ( $fields->all() as $field ) { |
|
321 | 321 | if ( isset( $this->view->unions[ $entry['form_id'] ] ) ) { |
322 | 322 | if ( isset( $this->view->unions[ $entry['form_id'] ][ $field->ID ] ) ) { |
323 | 323 | $field = $this->view->unions[ $entry['form_id'] ][ $field->ID ]; |
@@ -337,13 +337,13 @@ discard block |
||
337 | 337 | */ |
338 | 338 | do_action( 'gravityview/template/table/cells/after', $context ); |
339 | 339 | |
340 | - /** |
|
341 | - * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells. |
|
342 | - * @since 1.0.7 |
|
340 | + /** |
|
341 | + * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells. |
|
342 | + * @since 1.0.7 |
|
343 | 343 | * @param \GravityView_View $this Current GravityView_View object |
344 | 344 | * @deprecated Use `gravityview/template/table/cells/after` |
345 | - */ |
|
346 | - do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() ); |
|
345 | + */ |
|
346 | + do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() ); |
|
347 | 347 | |
348 | 348 | ?> |
349 | 349 | </tr> |
@@ -384,9 +384,9 @@ discard block |
||
384 | 384 | 'value' => $value, |
385 | 385 | 'hide_empty' => false, |
386 | 386 | 'zone_id' => 'directory_table-columns', |
387 | - 'label' => self::get_field_column_label( $field, $context ), |
|
387 | + 'label' => self::get_field_column_label( $field, $context ), |
|
388 | 388 | 'markup' => '<td id="{{ field_id }}" class="{{ class }}" data-label="{{label_value:data-label}}">{{ value }}</td>', |
389 | - 'form' => $form, |
|
389 | + 'form' => $form, |
|
390 | 390 | ); |
391 | 391 | |
392 | 392 | /** Output. */ |
@@ -411,11 +411,11 @@ discard block |
||
411 | 411 | do_action( 'gravityview/template/table/body/before', $context ); |
412 | 412 | |
413 | 413 | /** |
414 | - * @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows. |
|
415 | - * @deprecated Use `gravityview/template/table/body/before` |
|
416 | - * @since 1.0.7 |
|
417 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
418 | - */ |
|
414 | + * @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows. |
|
415 | + * @deprecated Use `gravityview/template/table/body/before` |
|
416 | + * @since 1.0.7 |
|
417 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
418 | + */ |
|
419 | 419 | do_action( 'gravityview_table_body_before', \GravityView_View::getInstance() /** ugh! */ ); |
420 | 420 | } |
421 | 421 | |
@@ -437,11 +437,11 @@ discard block |
||
437 | 437 | do_action( 'gravityview/template/table/body/after', $context ); |
438 | 438 | |
439 | 439 | /** |
440 | - * @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows. |
|
441 | - * @deprecated Use `gravityview/template/table/body/after` |
|
442 | - * @since 1.0.7 |
|
443 | - * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
444 | - */ |
|
440 | + * @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows. |
|
441 | + * @deprecated Use `gravityview/template/table/body/after` |
|
442 | + * @since 1.0.7 |
|
443 | + * @param \GravityView_View $gravityview_view Current GravityView_View object. |
|
444 | + */ |
|
445 | 445 | do_action( 'gravityview_table_body_after', \GravityView_View::getInstance() /** ugh! */ ); |
446 | 446 | } |
447 | 447 |