diff --git a/views/election.views.inc b/views/election.views.inc index 671cfcf2824bfe79fb17f5c7b1664a74504bd418..a66afd825fead98ed79c653ce197061cb5eb06a3 100644 --- a/views/election.views.inc +++ b/views/election.views.inc @@ -81,8 +81,8 @@ function election_views_data_alter(&$data) { // voting status $data['election']['vstatus'] = array( - 'title' => t('Voting open'), - 'help' => t('Whether voting is open for this election.'), + 'title' => t('Voting status'), + 'help' => t('The voting status for this election.'), 'field' => array( 'handler' => 'views_handler_field_election_vstatus', 'click sortable' => FALSE, @@ -99,7 +99,7 @@ function election_views_data_alter(&$data) { // nominations status // @todo make the filter always true if it's a referendum. $data['election']['nstatus'] = array( - 'title' => t('Nominations open'), + 'title' => t('Nominations status'), 'help' => t('Whether nominations are open for this election (not relevant for referendums).'), 'field' => array( 'handler' => 'views_handler_field_election_nstatus', diff --git a/views/handlers/views_handler_field_election_nstatus.inc b/views/handlers/views_handler_field_election_nstatus.inc index b5fb92f613374d84b4f33059edd117e56840d4fa..ca6c1bd7da82e0ffead7d43b6ad1a1984f0eec7c 100644 --- a/views/handlers/views_handler_field_election_nstatus.inc +++ b/views/handlers/views_handler_field_election_nstatus.inc @@ -19,8 +19,11 @@ class views_handler_field_election_nstatus extends views_handler_field { } function render($values) { - // Dummy election object - $election = (object) $values; + // Create dummy election object + $election = new stdClass; + foreach ($values as $key => $value) { + $election->{str_replace('election_', '', $key)} = $value; + } return _election_format_status($election, 'n'); } diff --git a/views/handlers/views_handler_field_election_vstatus.inc b/views/handlers/views_handler_field_election_vstatus.inc index e90b88088821e0c3177aaa67e10f5cd380b7595b..9c929b0ccb51e2304f9a58d8dde430cb019a55e5 100644 --- a/views/handlers/views_handler_field_election_vstatus.inc +++ b/views/handlers/views_handler_field_election_vstatus.inc @@ -19,8 +19,11 @@ class views_handler_field_election_vstatus extends views_handler_field { } function render($values) { - // Dummy election object - $election = (object) $values; + // Create dummy election object + $election = new stdClass; + foreach ($values as $key => $value) { + $election->{str_replace('election_', '', $key)} = $value; + } return _election_format_status($election, 'v'); }