Merge pull request #735 from TheRestartProject/RES-1984_network_coord…

…inators_group_approval RES-1984 Network Coordinator shouldn't see approval option
TheRestartProject · Jul 11, 2024 · 25d8a25 · 25d8a25
2 parents 7f3f82e + 147710e
commit 25d8a25
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 2 deletions.
diff --git a/app/Http/Controllers/GroupController.php b/app/Http/Controllers/GroupController.php
@@ -503,7 +503,9 @@ public function edit(Request $request, $id, Geocoder $geocoder)
             'id' => $id,
             'name' => $group->name,
             'audits' => $group->audits,
-            'networks' => Network::all()
+            'networks' => Network::all(),
+            'can_approve' => Fixometer::hasRole($user, 'Administrator') ||
+                Fixometer::hasRole($user, 'NetworkCoordinator') && $isCoordinatorForGroup
         ]);
     }
 

diff --git a/resources/views/group/edit.blade.php b/resources/views/group/edit.blade.php
@@ -19,7 +19,7 @@
               <div class="tab-pane active" id="details">
                 <div class="vue">
                   <GroupAddEditPage :idgroups="{{ $id }}"
-                                    :can-approve="{{ (Auth::user()->hasRole('Administrator') || Auth::user()->hasRole('NetworkCoordinator')) ? "true" : "false" }}"
+                                    :can-approve="{{ $can_approve ? "true": "false" }}"
                                     :can-network="{{ Auth::user()->hasRole('Administrator') ? "true" : "false" }}"
                   />
                 </div>

diff --git a/tests/Feature/Groups/GroupEditTest.php b/tests/Feature/Groups/GroupEditTest.php
@@ -4,6 +4,7 @@
 
 use App\Group;
 use App\GroupTags;
+use App\Network;
 use App\Role;
 use App\User;
 use Carbon\Carbon;
@@ -189,4 +190,33 @@ public function edit_email()
         $group->refresh();
         $this->assertEquals('[email protected]', $group->email);
     }
+
+    public function testEditAsNetworkCoordinator() {
+        $network = Network::factory()->create();
+        $coordinator = User::factory()->restarter()->create();
+        $network->addCoordinator($coordinator);
+        $coordinator->refresh();
+        $this->actingAs($coordinator);
+
+        $idgroups = $this->createGroup(
+            'Test Group',
+            'https://therestartproject.org',
+            'London',
+            'Some text.',
+            true,
+            false,
+            '[email protected]'
+        );
+
+        $response = $this->get('/group/edit/' . $idgroups);
+        $response->assertStatus(200);
+
+        // Shouldn't be able to approve the group, as it has not yet been put in our network (by an admin).
+        $this->assertVueProperties($response, [
+            [],
+            [
+                ':can-approve' => 'false',
+            ],
+        ]);
+    }
 }