From 33d7d3a5ec4c543f412221ff045c02dcec4c88e2 Mon Sep 17 00:00:00 2001 From: Adam Cox Date: Fri, 2 Oct 2026 16:44:00 -0500 Subject: [PATCH 1/3] fix bug with non-authed users accessing derivatives --- ohmg/conf/http.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ohmg/conf/http.py b/ohmg/conf/http.py index d864271c..05586453 100644 --- a/ohmg/conf/http.py +++ b/ohmg/conf/http.py @@ -45,6 +45,7 @@ def user_info_from_request(request): "is_authenticated": False, "is_staff": False, "perms": [], + "loaded_maps": [], } return user_info From b8c4c92918b7da5d808da2aaa7c976aa2bec50c3 Mon Sep 17 00:00:00 2001 From: Adam Cox Date: Fri, 2 Oct 2026 16:44:59 -0500 Subject: [PATCH 2/3] put layers listing into map details section --- .../src/components/map/Map.svelte | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/ohmg/frontend/svelte_components/src/components/map/Map.svelte b/ohmg/frontend/svelte_components/src/components/map/Map.svelte index 78f7ba52..d746fe5c 100644 --- a/ohmg/frontend/svelte_components/src/components/map/Map.svelte +++ b/ohmg/frontend/svelte_components/src/components/map/Map.svelte @@ -30,6 +30,7 @@ import MapContributors from '../tables/MapContributors.svelte'; import Sessions from '../tables/Sessions.svelte'; + import Layers from '../tables/Layers.svelte'; import Breadcrumbs from './Breadcrumbs.svelte'; @@ -478,6 +479,7 @@ {id: "details", title: "Details"}, {id: "stats", title: "Stats"}, {id: "activity", title: "Activity"}, + {id: "layers", title: "Layers"}, ]} bind:activeTab={detailsSectionActiveTab}> {#if detailsSectionActiveTab == "details"}
@@ -490,13 +492,19 @@ {:else if detailsSectionActiveTab == "activity"} -
-

- Below is complete record of all preparation or georeferencing actions that have been performed on documents - within this map. Currently, trimming or "multimask" work is not reflected in this table. -

-
- +
+

+ Below is complete record of all preparation or georeferencing actions that have been performed on documents + within this map. Currently, trimming or "multimask" work is not reflected in this table. +

+
+ + {:else if detailsSectionActiveTab == "layers"} + {#if CONTEXT.user.is_staff} + + {:else} + coming soon! + {/if} {/if} From e96198961dc7dae0e828233f05993e4020d5ea13 Mon Sep 17 00:00:00 2001 From: Adam Cox Date: Fri, 2 Oct 2026 16:48:00 -0500 Subject: [PATCH 3/3] cleanup header styles for all tables --- .../src/components/tables/Jobs.svelte | 2 +- .../src/components/tables/Layers.svelte | 7 ++- .../src/components/tables/Sessions.svelte | 19 +++---- .../tables/widgets/FacetFilterSelect.svelte | 2 +- .../tables/widgets/SortableHeader.svelte | 53 +++++++++---------- 5 files changed, 40 insertions(+), 43 deletions(-) diff --git a/ohmg/frontend/svelte_components/src/components/tables/Jobs.svelte b/ohmg/frontend/svelte_components/src/components/tables/Jobs.svelte index bcdcce49..b8986f12 100644 --- a/ohmg/frontend/svelte_components/src/components/tables/Jobs.svelte +++ b/ohmg/frontend/svelte_components/src/components/tables/Jobs.svelte @@ -240,7 +240,7 @@ } td { white-space: nowrap; - padding: 2px 0.5em 2px 0; + padding: 2px 0.25em; vertical-align: middle; } td.ts-col { diff --git a/ohmg/frontend/svelte_components/src/components/tables/Layers.svelte b/ohmg/frontend/svelte_components/src/components/tables/Layers.svelte index dd19fb7c..dd7e71fb 100644 --- a/ohmg/frontend/svelte_components/src/components/tables/Layers.svelte +++ b/ohmg/frontend/svelte_components/src/components/tables/Layers.svelte @@ -161,7 +161,7 @@
- {lyr.nickname} + {lyr.nickname}
{lyr.nickname} @@ -213,7 +213,7 @@ } td { white-space: nowrap; - padding: 2px 0.5em; + padding: 2px 0.25em; vertical-align: middle; } .table-container { @@ -224,6 +224,9 @@ display: inline-block; text-align: center; } + .thumb-container > img { + max-height: 50px; + } .filter-level { max-width: calc(100% - 75px); } diff --git a/ohmg/frontend/svelte_components/src/components/tables/Sessions.svelte b/ohmg/frontend/svelte_components/src/components/tables/Sessions.svelte index 4c3286c6..8da6d912 100644 --- a/ohmg/frontend/svelte_components/src/components/tables/Sessions.svelte +++ b/ohmg/frontend/svelte_components/src/components/tables/Sessions.svelte @@ -162,15 +162,7 @@ {/if} {#if showResource} - -
- Resource -
- + {/if} @@ -211,7 +203,7 @@ {#if s.doc2} {#if showThumbs}
- {s.doc2.nickname} + {s.doc2.nickname}
{/if} @@ -224,7 +216,7 @@ {#if s.lyr2} {#if showThumbs}
- {s.reg2.nickname} + {s.reg2.nickname}
{/if} @@ -278,7 +270,7 @@ } td { white-space: nowrap; - padding: 2px 0.5em 2px 0; + padding: 2px 0.25em; vertical-align: middle; } .table-container { @@ -289,6 +281,9 @@ display: inline-block; text-align: center; } + .thumb-container > img { + max-height: 50px; + } @media screen and (max-width: 768px) { .filter-level, :global(.filter-input), diff --git a/ohmg/frontend/svelte_components/src/components/tables/widgets/FacetFilterSelect.svelte b/ohmg/frontend/svelte_components/src/components/tables/widgets/FacetFilterSelect.svelte index 9e95e221..8b39df1c 100644 --- a/ohmg/frontend/svelte_components/src/components/tables/widgets/FacetFilterSelect.svelte +++ b/ohmg/frontend/svelte_components/src/components/tables/widgets/FacetFilterSelect.svelte @@ -4,7 +4,7 @@ export let value = null; export let items = []; export let placeholder = 'Choose a filter...'; - export let containerStyles = 'width:300px;'; + export let containerStyles = 'width:225px;'; export let offset = 0; diff --git a/ohmg/frontend/svelte_components/src/components/tables/widgets/SortableHeader.svelte b/ohmg/frontend/svelte_components/src/components/tables/widgets/SortableHeader.svelte index f9408566..9896a4d3 100644 --- a/ohmg/frontend/svelte_components/src/components/tables/widgets/SortableHeader.svelte +++ b/ohmg/frontend/svelte_components/src/components/tables/widgets/SortableHeader.svelte @@ -9,43 +9,42 @@ export let offset = 0; export let sortParam = null; export let sortDir = 'asc'; + export let toggleVar = null; let popup = alt ? alt : `Sort by ${value}`; $: active = sortParam == value; -{#if sortParam} - -{:else} - - {title} - -{/if} + + {/if} + {#if toggleVar != null} + + {/if} +