Fixed button states

2022-02-15 16:58:39 +00:00
parent 3735e1e9ce
commit 77da13e0a0
2 changed files with 5 additions and 3 deletions
--- a/src/Controller/OrganisationController.php
+++ b/src/Controller/OrganisationController.php
@@ -625,10 +625,12 @@ class OrganisationController extends SimpleController
        $params['ci'] = $this->ci;

        $sprunje = $classMapper->createInstance('organisation_sprunje', $classMapper, $params);
+        $sprunje->extendQuery(function ($query) use ($currentUser) {
+            return $query->withUser($currentUser->id);
+            });
        if (!$currentUser->isMaster() && $currentUser->roles()->where('slug', 'organisations-admin')->count() == 0) {
-            $sprunje->extendQuery(function ($query) use ($currentUser) {
+            $sprunje->extendQuery(function ($query) {
                return $query->where('flag_approved', true)
-                    ->withUser($currentUser->id)
                    ->orWhereNotNull('is_member');
            });
        }