Commit cdb78e04 authored by alexpott's avatar alexpott

Issue #2003334 by phenaproxima, marlatt: Rename Views method render_grouping() to renderGrouping().

parent 33144ded
...@@ -78,7 +78,7 @@ public function render() { ...@@ -78,7 +78,7 @@ public function render() {
} }
// Group the rows according to the grouping field, if specified. // Group the rows according to the grouping field, if specified.
$sets = $this->render_grouping($this->view->result, $this->options['grouping']); $sets = $this->renderGrouping($this->view->result, $this->options['grouping']);
// Grab the alias of the 'id' field added by // Grab the alias of the 'id' field added by
// entity_reference_plugin_display. // entity_reference_plugin_display.
......
...@@ -432,7 +432,7 @@ function render() { ...@@ -432,7 +432,7 @@ function render() {
} }
// Group the rows according to the grouping instructions, if specified. // Group the rows according to the grouping instructions, if specified.
$sets = $this->render_grouping( $sets = $this->renderGrouping(
$this->view->result, $this->view->result,
$this->options['grouping'], $this->options['grouping'],
TRUE TRUE
...@@ -531,7 +531,7 @@ function render_grouping_sets($sets, $level = 0) { ...@@ -531,7 +531,7 @@ function render_grouping_sets($sets, $level = 0) {
* ) * )
* @endcode * @endcode
*/ */
function render_grouping($records, $groupings = array(), $group_rendered = NULL) { public function renderGrouping($records, $groupings = array(), $group_rendered = NULL) {
// This is for backward compability, when $groupings was a string containing // This is for backward compability, when $groupings was a string containing
// the ID of a single field. // the ID of a single field.
if (is_string($groupings)) { if (is_string($groupings)) {
......
...@@ -191,13 +191,13 @@ function _testGrouping($stripped = FALSE) { ...@@ -191,13 +191,13 @@ function _testGrouping($stripped = FALSE) {
// The newer api passes the value of the grouping as well. // The newer api passes the value of the grouping as well.
$sets_new_rendered = $view->style_plugin->render_grouping($view->result, $view->style_plugin->options['grouping'], TRUE); $sets_new_rendered = $view->style_plugin->renderGrouping($view->result, $view->style_plugin->options['grouping'], TRUE);
$this->assertEqual($sets_new_rendered, $expected, t('The style plugins should proper group the results with grouping by the rendered output.')); $this->assertEqual($sets_new_rendered, $expected, t('The style plugins should proper group the results with grouping by the rendered output.'));
// Don't test stripped case, because the actual value is not stripped. // Don't test stripped case, because the actual value is not stripped.
if (!$stripped) { if (!$stripped) {
$sets_new_value = $view->style_plugin->render_grouping($view->result, $view->style_plugin->options['grouping'], FALSE); $sets_new_value = $view->style_plugin->renderGrouping($view->result, $view->style_plugin->options['grouping'], FALSE);
// Reorder the group structure to grouping by value. // Reorder the group structure to grouping by value.
$expected['Singer'] = $expected['Job: Singer']; $expected['Singer'] = $expected['Job: Singer'];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment