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 2b2734c816f765564f7b2e09791bc85e25ac05a7..5786c1b6f057a68f83497b45da7569bfc6b5ed26 100644 (file)
--- 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 0b27b285eb51bf7041fb80456814bd868793fae0..d3884f5cece138c607cf02521af0111d923e94df 100644 (file)
--- 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 446bc736147cc35cdf1a63bfa014ede6b995c181..02fd3a97f2dcf0a5868c4947709b1bccdd050fb3 100644 (file)
--- 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;
         }