Fixed more bugs

adamcrampton · Aug 24, 2018 · 2e800be · 2e800be
1 parent 4614a6b
commit 2e800be
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/app/Http/Controllers/ProviderController.php b/app/Http/Controllers/ProviderController.php
@@ -151,7 +151,7 @@ public function batchUpdate(Request $request, User $user, Provider $provider)
         $deleteArray = $this->buildDeleteArray($request, 'provider');
 
         // Check for any items tagged for restoration. If found, add to array for batch restore.
-        $deleteArray = $this->buildRestoreArray($request, 'provider');
+        $restoreArray = $this->buildRestoreArray($request, 'provider');
 
         // Determine which fields have changed, and prepare array for batch update.
         $updateArray = $this->buildUpdateArray($request, 'provider', ['provider_name', 'provider_email']);   

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -64,7 +64,8 @@ public function indexRestore(User $user)
         return view('admin.user_restore', [
             'config' => $this->configData,
             'adminSections' => $this->adminSections,
-            'userList' => $this->deletedUserList
+            'userList' => $this->deletedUserList,
+            'permissionList' => $this->permissionList
         ]);
     }
 

diff --git a/resources/views/admin/provider_restore.blade.php b/resources/views/admin/provider_restore.blade.php
@@ -16,7 +16,7 @@
 						<tr>
 							<th scope="col">Name</th>
 							<th scope="col">Email</th>
-							<th scope="col" class="text-center">Delete</th>
+							<th scope="col" class="text-center">Restore</th>
 						</tr>
 					</thead>
 					@foreach($providerList as $index => $provider)

diff --git a/resources/views/admin/staff_member_restore.blade.php b/resources/views/admin/staff_member_restore.blade.php
@@ -17,7 +17,7 @@
 							<th scope="col">First Name</th>
 							<th scope="col">Last Name</th>
 							<th scope="col">Email</th>
-							<th scope="col" class="text-center">Delete</th>
+							<th scope="col" class="text-center">Restore</th>
 						</tr>
 					</thead>
 					@foreach($staffList as $index => $staff)

diff --git a/resources/views/admin/user.blade.php b/resources/views/admin/user.blade.php
@@ -72,7 +72,7 @@
 							<th scope="col">Last Name</th>
 							<th scope="col">Email</th>
 							<th scope="col">Permission Level</th>
-							<th scope="col" class="text-center">Delete</th>
+							<th scope="col" class="text-center">Restore</th>
 						</tr>
 					</thead>
 					@foreach($userList as $index => $user)

diff --git a/resources/views/admin/user_restore.blade.php b/resources/views/admin/user_restore.blade.php
@@ -18,7 +18,7 @@
 							<th scope="col">Last Name</th>
 							<th scope="col">Email</th>
 							<th scope="col">Permission Level</th>
-							<th scope="col" class="text-center">Delete</th>
+							<th scope="col" class="text-center">Restore</th>
 						</tr>
 					</thead>
 					@foreach($userList as $index => $user)