Compare commits
2 Commits
v1.3.9
...
96ba5d034f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
96ba5d034f | ||
|
|
2402b7cbc8 |
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "app-ts",
|
"name": "app-ts",
|
||||||
"version": "1.3.9",
|
"version": "1.4.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "app-ts",
|
"name": "app-ts",
|
||||||
"version": "1.3.9",
|
"version": "1.4.0",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@dnd-kit/core": "^6.3.1",
|
"@dnd-kit/core": "^6.3.1",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "app-ts",
|
"name": "app-ts",
|
||||||
"version": "1.3.9",
|
"version": "1.4.0",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "dist/server.js",
|
"main": "dist/server.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ export default function LeaveRequests() {
|
|||||||
|
|
||||||
const fetchRequests = useCallback(async () => {
|
const fetchRequests = useCallback(async () => {
|
||||||
try {
|
try {
|
||||||
const response = await apiFetch(`${API_BASE}/leave-requests`);
|
const response = await apiFetch(`${API_BASE}/leave-requests?mine=1`);
|
||||||
if (response.status === 401) return;
|
if (response.status === 401) return;
|
||||||
const result = await response.json();
|
const result = await response.json();
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ export default async function leaveRequestsRoutes(
|
|||||||
const isAdmin = authData.permissions.includes("attendance.approve");
|
const isAdmin = authData.permissions.includes("attendance.approve");
|
||||||
|
|
||||||
const where: Record<string, unknown> = {};
|
const where: Record<string, unknown> = {};
|
||||||
if (!isAdmin) where.user_id = authData.userId;
|
if (!isAdmin || query.mine === "1") where.user_id = authData.userId;
|
||||||
else if (query.user_id) where.user_id = Number(query.user_id);
|
else if (query.user_id) where.user_id = Number(query.user_id);
|
||||||
if (query.status) where.status = String(query.status);
|
if (query.status) where.status = String(query.status);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user