oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'alpha' into refactor/model-pricing

Browse Source
This commit is contained in:
t0ng7u
2025-07-25 20:33:14 +08:00
parent 34d45bb3b8 fe16d05fbb
commit 52a9cee0e1
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
middleware/auth.go
View File

@@ -122,6 +122,7 @@ func authHelper(c *gin.Context, minRole int) {
c.Set("role", role) c.Set("role", role)
c.Set("id", id) c.Set("id", id)
c.Set("group", session.Get("group")) c.Set("group", session.Get("group"))
c.Set("user_group", session.Get("group"))
c.Set("use_access_token", useAccessToken) c.Set("use_access_token", useAccessToken)
//userCache, err := model.GetUserCache(id.(int)) //userCache, err := model.GetUserCache(id.(int))

5
web/src/hooks/mj-logs/useMjLogsData.js
View File

@@ -94,6 +94,11 @@ export const useMjLogsData = () => {
const parsed = JSON.parse(savedColumns); const parsed = JSON.parse(savedColumns);
const defaults = getDefaultColumnVisibility(); const defaults = getDefaultColumnVisibility();
const merged = { ...defaults, ...parsed }; const merged = { ...defaults, ...parsed };
// If not admin, force hide columns only visible to admins
if (!isAdminUser) {
merged[COLUMN_KEYS.CHANNEL] = false;
merged[COLUMN_KEYS.SUBMIT_RESULT] = false;
}
setVisibleColumns(merged); setVisibleColumns(merged);
} catch (e) { } catch (e) {
console.error('Failed to parse saved column preferences', e); console.error('Failed to parse saved column preferences', e);

4
web/src/hooks/task-logs/useTaskLogsData.js
View File

@@ -92,6 +92,10 @@ export const useTaskLogsData = () => {
const parsed = JSON.parse(savedColumns); const parsed = JSON.parse(savedColumns);
const defaults = getDefaultColumnVisibility(); const defaults = getDefaultColumnVisibility();
const merged = { ...defaults, ...parsed }; const merged = { ...defaults, ...parsed };
// If not admin, force hide columns only visible to admins
if (!isAdminUser) {
merged[COLUMN_KEYS.CHANNEL] = false;
}
setVisibleColumns(merged); setVisibleColumns(merged);
} catch (e) { } catch (e) {
console.error('Failed to parse saved column preferences', e); console.error('Failed to parse saved column preferences', e);

6
web/src/hooks/usage-logs/useUsageLogsData.js
View File

@@ -116,6 +116,12 @@ export const useLogsData = () => {
const parsed = JSON.parse(savedColumns); const parsed = JSON.parse(savedColumns);
const defaults = getDefaultColumnVisibility(); const defaults = getDefaultColumnVisibility();
const merged = { ...defaults, ...parsed }; const merged = { ...defaults, ...parsed };
// If not admin, force hide columns only visible to admins
if (!isAdminUser) {
merged[COLUMN_KEYS.CHANNEL] = false;
merged[COLUMN_KEYS.USERNAME] = false;
merged[COLUMN_KEYS.RETRY] = false;
}
setVisibleColumns(merged); setVisibleColumns(merged);
} catch (e) { } catch (e) {
console.error('Failed to parse saved column preferences', e); console.error('Failed to parse saved column preferences', e);