yangli/worldshine-redesign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix
All checks were successful
Build And Deploy Main / build-and-deploy (push) Successful in 34s
Details

Browse Source
This commit is contained in:
Lixian Zhou
2026-03-10 16:30:59 -04:00
parent 90629347a5
commit 137b137312
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/components/admin/Permission.js
View File

@@ -66,7 +66,7 @@ const Permission = () => {
<th>Preferred Name</th> <th>Preferred Name</th>
<th>Username</th> <th>Username</th>
<th>Status</th> <th>Status</th>
<th>Roles</th> <th>Permissions</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
@@ -77,7 +77,7 @@ const Permission = () => {
<td>{employee?.name_cn}</td> <td>{employee?.name_cn}</td>
<td>{employee?.username}</td> <td>{employee?.username}</td>
<td>{employee?.status}</td> <td>{employee?.status}</td>
<td>{employee?.roles?.join(", ")}</td> <td>{employee?.permissions?.join(", ") || "-"}</td>
<td> <td>
<button <button
className="btn btn-primary btn-sm me-2" className="btn btn-primary btn-sm me-2"

4
client/src/components/employees/EmployeeList.js
View File

@@ -57,7 +57,7 @@ const EmployeeList = () => {
<th>Preferred Name</th> <th>Preferred Name</th>
<th>Username</th> <th>Username</th>
<th>Status</th> <th>Status</th>
<th>Roles</th> <th>Permissions</th>
<th></th> <th></th>
</tr> </tr>
@@ -69,7 +69,7 @@ const EmployeeList = () => {
<td>{employee?.name_cn}</td> <td>{employee?.name_cn}</td>
<td>{employee?.username}</td> <td>{employee?.username}</td>
<td>{employee?.status}</td> <td>{employee?.status}</td>
<td>{employee?.roles?.join(', ')}</td> <td>{employee?.permissions?.join(', ') || '-'}</td>
<td> <td>
{AuthService.canAddOrEditEmployees() && <button className="btn btn-primary btn-sm me-2" onClick={() => goToEdit(employee?.id)}>Edit</button> } {AuthService.canAddOrEditEmployees() && <button className="btn btn-primary btn-sm me-2" onClick={() => goToEdit(employee?.id)}>Edit</button> }
{AuthService.canViewEmployees() && <button className="btn btn-default btn-sm me-2" onClick={() => goToView(employee?.id)}>View</button>} {AuthService.canViewEmployees() && <button className="btn btn-default btn-sm me-2" onClick={() => goToView(employee?.id)}>View</button>}