Ver código fonte

Pro pro access listing updates

Vijayakrishnan 4 anos atrás
pai
commit
bf1ac264ce

+ 2 - 1
app/Http/Controllers/pros_SINGLE_Controller.php

@@ -493,7 +493,8 @@ class pros_SINGLE_Controller extends Controller
 			if($record) return redirect('/pros/view/' . $record->uid . '/SUB_pro_access');
 		}
 		$subRecords = DB::table('pro_pro_access')->where('owner_pro_id', $record->id)->get();
-		return response()->view('admin/pros_SINGLE/SUB_pro_access', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		$result_pros = DB::select("select id, name_display from pro");
+		return response()->view('admin/pros_SINGLE/SUB_pro_access', compact('record', 'subRecords', 'result_pros'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/SUB_mcp_updates

+ 3 - 0
generatecv/tree.txt

@@ -1111,6 +1111,9 @@ ADMIN
             clients
             pro_access
                 id=pro_pro_access.owner_pro_id=>/pro_access/view/UID
+                !qry:pros:select id, name_display from pro
+                !col:owner_pro_id:Owner Pro:~pros:name_display:id,=,$$owner_pro_id:all
+                !col:accessible_pro_id:Accessible Pro:~pros:name_display:id,=,$$accessible_pro_id:all
                 add_new:pro_pro_access=>/pro_access/view/UID
                     ownerProUid:hidden=uid
                     accessibleProUid:record:pro:uid,name_first

+ 4 - 4
resources/views/admin/pros_SINGLE/SUB_pro_access.blade.php

@@ -15,8 +15,8 @@
                 <thead>
                 <tr>
                     <th>&nbsp;</th>
-<th>Owner Pro Id</th>
-<th>Accessible Pro Id</th>
+<th>Owner Pro</th>
+<th>Accessible Pro</th>
 <th>Memo</th>
 <th>Can Assign As Rme</th>
 <th>Can Assign As Rmm</th>
@@ -38,8 +38,8 @@
                 @foreach($subRecords as $subRecord)
                     <tr>
                         <td><a href="/pro_access/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
-<td><?= $subRecord->owner_pro_id ?></td>
-<td><?= $subRecord->accessible_pro_id ?></td>
+<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $subRecord->owner_pro_id], ], 'all'); ?></td>
+<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $subRecord->accessible_pro_id], ], 'all'); ?></td>
 <td><?= $subRecord->memo ?></td>
 <td><?= $subRecord->can_assign_as_rme ?></td>
 <td><?= $subRecord->can_assign_as_rmm ?></td>