Compare commits

..

5 Commits
1.2.1 ... main

Author SHA1 Message Date
b4ff7d4686 Merge pull request 'Allow recruiters to see admin pages' (#206) from Recruiter-Permission-Fix into main
All checks were successful
Testing Site CD / Update Development (push) Successful in 4m15s
Reviewed-on: #206
2026-03-21 18:42:29 -05:00
171e3b3137 Merge branch 'main' into Recruiter-Permission-Fix
All checks were successful
Pull Request CI / Merge Check (pull_request) Successful in 3m53s
2026-03-21 18:42:18 -05:00
dd2ac19e4a Allow recruiters to see admin pages
All checks were successful
Pull Request CI / Merge Check (pull_request) Successful in 4m0s
2026-03-21 19:44:57 -04:00
18ba9b576c Merge pull request 'Fixed error on posting admin comment' (#205) from Application-Admin-Comment-Fix into main
Some checks failed
Testing Site CD / Update Development (push) Has been cancelled
Reviewed-on: #205
2026-03-21 18:41:06 -05:00
6c85677e1b Fixed error on posting admin comment
All checks were successful
Pull Request CI / Merge Check (pull_request) Successful in 4m10s
2026-03-12 22:23:28 -04:00
2 changed files with 3 additions and 3 deletions

View File

@@ -396,11 +396,11 @@ VALUES(?, ?, ?, 1);`
INNER JOIN members AS member ON member.id = app.poster_id INNER JOIN members AS member ON member.id = app.poster_id
WHERE app.id = ?; `; WHERE app.id = ?; `;
const comment = await conn.query(getSQL, [result.insertId]) const comment = await conn.query(getSQL, [result.insertId])
audit.record('application', 'comment_added', { actorId: user.id, targetId: appID }, { commentId: result.insertId }); audit.record('application', 'comment_added', { actorId: user.id, targetId: appID }, { commentId: Number(result.insertId) });
logger.info('app', "Admin application comment posted", { logger.info('app', "Admin application comment posted", {
application: appID, application: appID,
poster: user.id, poster: user.id,
comment: result.insertId, comment: Number(result.insertId),
}) })
res.status(201).json(comment[0]); res.status(201).json(comment[0]);

View File

@@ -33,7 +33,7 @@ const router = createRouter({
// ADMIN / STAFF ROUTES // ADMIN / STAFF ROUTES
{ {
path: '/administration', path: '/administration',
meta: { requiresAuth: true, memberOnly: true, roles: ['17th Administrator', '17th HQ', '17th Command'] }, meta: { requiresAuth: true, memberOnly: true, roles: ['17th Administrator', '17th HQ', '17th Command', '17th Recruiter'] },
children: [ children: [
{ path: 'applications', component: () => import('@/pages/ManageApplications.vue') }, { path: 'applications', component: () => import('@/pages/ManageApplications.vue') },
{ path: 'applications/:id', component: () => import('@/pages/ManageApplications.vue') }, { path: 'applications/:id', component: () => import('@/pages/ManageApplications.vue') },