Governance: fix voting members on feature disabled

dpslwk · dpslwk · commit 14eeb4280cec · 2021-09-26T19:03:34.000+01:00
diff --git a/app/HMS/Governance/VotingManager.php b/app/HMS/Governance/VotingManager.php
@@ -92,7 +92,7 @@ public function countCurrentMembers()
     public function votingMembers()
     {
         if ($this->features->isDisabled('voting_status')) {
-            return $this->countCurrentMembers();
+            return $this->roleRepository->findOneByName(Role::MEMBER_CURRENT)->getUsers();
         }
 
         $v = collect();
@@ -139,6 +139,10 @@ public function votingMembers()
      */
     public function countVotingMembers()
     {
+        if ($this->features->isDisabled('voting_status')) {
+            return $this->countCurrentMembers();
+        }
+
         return $this->votingMembers()->count();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function countCurrentMembers()`
`92`	`92`	`public function votingMembers()`
`93`	`93`	`{`
`94`	`94`	`if ($this->features->isDisabled('voting_status')) {`
`95`		`- return $this->countCurrentMembers();`
	`95`	`+ return $this->roleRepository->findOneByName(Role::MEMBER_CURRENT)->getUsers();`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`$v = collect();`
`@@ -139,6 +139,10 @@ public function votingMembers()`
`139`	`139`	`*/`
`140`	`140`	`public function countVotingMembers()`
`141`	`141`	`{`
	`142`	`+ if ($this->features->isDisabled('voting_status')) {`
	`143`	`+ return $this->countCurrentMembers();`
	`144`	`+ }`
	`145`	`+`
`142`	`146`	`return $this->votingMembers()->count();`
`143`	`147`	`}`
`144`	`148`