From: Johan Cwiklinski <johan@x-tnd.be>
Date: Thu, 7 Oct 2021 05:22:09 +0000 (+0200)
Subject: Fix contributions and transactions list for non parent members
X-Git-Tag: 0.9.5.1~37
X-Git-Url: https://git.agnieray.net/?a=commitdiff_plain;h=8b1b72a9574c86515ab3eb6faee1359938af8007;p=galette.git

Fix contributions and transactions list for non parent members
---

diff --git a/galette/lib/Galette/Controllers/Crud/ContributionsController.php b/galette/lib/Galette/Controllers/Crud/ContributionsController.php
index 2b2734c81..5786c1b6f 100644
--- a/galette/lib/Galette/Controllers/Crud/ContributionsController.php
+++ b/galette/lib/Galette/Controllers/Crud/ContributionsController.php
@@ -442,7 +442,7 @@ class ContributionsController extends CrudController
         }
 
         if (!$this->login->isAdmin() && !$this->login->isStaff() && $value != $this->login->id) {
-            if ($value === 'all') {
+            if ($value === 'all' || empty($value)) {
                 $value = $this->login->id;
             } else {
                 $member = new Adherent(
diff --git a/galette/lib/Galette/Entity/Contribution.php b/galette/lib/Galette/Entity/Contribution.php
index 0b27b285e..d3884f5ce 100644
--- a/galette/lib/Galette/Entity/Contribution.php
+++ b/galette/lib/Galette/Entity/Contribution.php
@@ -1443,7 +1443,7 @@ class Contribution
     public function canShow(Login $login): bool
     {
         //admin and staff users can edit, as well as member itself
-        if ($this->id && $login->id == $this->id || $login->isAdmin() || $login->isStaff()) {
+        if (!$this->id || $this->id && $login->id == $this->_member || $login->isAdmin() || $login->isStaff()) {
             return true;
         }
 
diff --git a/galette/lib/Galette/Entity/Transaction.php b/galette/lib/Galette/Entity/Transaction.php
index 446bc7361..02fd3a97f 100644
--- a/galette/lib/Galette/Entity/Transaction.php
+++ b/galette/lib/Galette/Entity/Transaction.php
@@ -662,7 +662,7 @@ class Transaction
     public function canShow(Login $login): bool
     {
         //admin and staff users can edit, as well as member itself
-        if ($this->id && $login->id == $this->id || $login->isAdmin() || $login->isStaff()) {
+        if (!$this->id || $this->id && $login->id == $this->_member || $login->isAdmin() || $login->isStaff()) {
             return true;
         }