diff --git a/election.info.yml b/election.info.yml index cc9b799767b2c593e0a44a721ebc5b63f5b964a7..08ff86bdc032e99b46b0b449d633412b68ce10e8 100644 --- a/election.info.yml +++ b/election.info.yml @@ -8,6 +8,6 @@ dependencies: - twig_tweak - encrypt - election:election_conditions - - election:election_fptp - - election:election_openstv + - csv_import_export:csv_import_export - token:token + - views_autocomplete_filters:views_autocomplete_filters diff --git a/election.module b/election.module index 789e2c04390e041fd42998933b1250c25aaa1e95..af37897aaeda827ff9a7b3d032bbaf65c4c282cc 100644 --- a/election.module +++ b/election.module @@ -249,6 +249,7 @@ function election_check_phase_status_changed($entity) { $phases = []; foreach (Election::getPhases() as $phase_id => $phase) { if ($entity->original->getPhaseStatus($phase_id) != $entity->getPhaseStatus($phase_id)) { + // Phases will always have unique key as we are using $phase_id as key. $phases[$phase_id] = $phase; } @@ -263,7 +264,7 @@ function election_check_phase_status_changed($entity) { // } // } } - return array_unique($phases); + return $phases; } /** diff --git a/modules/election_eligibility_export/src/Form/ExportEligibleUsers.php b/modules/election_eligibility_export/src/Form/ExportEligibleUsers.php index 49312f7c013b9d9d3ec424313f7e00f18d532a5b..d60e58fd64305f5fcf5d9d65119ae800ce1a9b2c 100644 --- a/modules/election_eligibility_export/src/Form/ExportEligibleUsers.php +++ b/modules/election_eligibility_export/src/Form/ExportEligibleUsers.php @@ -198,7 +198,7 @@ class ExportEligibleUsers extends BatchDownloadCSVForm { if ($form_state->getValue('phase') == 'voting' && ($form_state->getValue('category') == 'already' || $form_state->getValue('category') == 'not_already')) { $election = Election::load($form_state->get('election_id')); - $already = $election->getVoterUserIds(); + $already = $election->getVoterIds(); if ($form_state->getValue('category') == 'already') { return array_intersect($uids, $already); } diff --git a/modules/election_statistics/src/Plugin/ElectionStatistic/VotersByPostType.php b/modules/election_statistics/src/Plugin/ElectionStatistic/VotersByPostType.php index 87c2f2af9278f82267ef2ef07109fa1168ef5acb..725c7835feb7e885f17cc4968d08db84090243a8 100644 --- a/modules/election_statistics/src/Plugin/ElectionStatistic/VotersByPostType.php +++ b/modules/election_statistics/src/Plugin/ElectionStatistic/VotersByPostType.php @@ -54,7 +54,7 @@ class VotersByPostType extends ElectionStatisticBase implements ElectionStatisti // Number of voters who voted for this category overall // Voters who voted for combinations - $post_voters = $post->getVoterUserIds(); + $post_voters = $post->getVoterIds(); foreach ($post_voters as $uid) { if (!isset($voter_values[$uid])) { $voter_values[$uid] = [];