- Goodbye, Admin
+ Goodbye, Superuser
- You admin permissions have been disabled. You are now a regular user again.
+ You superuser permissions have been disabled. You are now a regular user again.
Continue
diff --git a/frontend/pages/users/self/admin/enable.vue b/frontend/pages/users/self/admin/enable.vue
index 2a04d3874..7a6a8fff2 100644
--- a/frontend/pages/users/self/admin/enable.vue
+++ b/frontend/pages/users/self/admin/enable.vue
@@ -4,9 +4,9 @@
{{ errorMessage }}
-
Welcome, Admin
+ Welcome, mighty Superuser
- Your admin permissions are now enabled. Use them responsibly.
+ Your superuser permissions are now enabled. Use them responsibly.
Continue
@@ -26,7 +26,7 @@ export default {
if (error?.response?.data?.code === 'reauth-required') {
redirectToReAuth({ auth: $auth, route });
} else {
- errorMessage = error?.response?.detail || 'Failed to enable admin permissions';
+ errorMessage = error?.response?.detail || 'Failed to enable superuser permissions';
}
}
return { errorMessage };
diff --git a/frontend/utils/urls.js b/frontend/utils/urls.js
index cf5a0b31c..4cca605f4 100644
--- a/frontend/utils/urls.js
+++ b/frontend/utils/urls.js
@@ -80,8 +80,15 @@ export class SearchableCursorPaginationFetcher {
_createFetcher() {
const searchParams = new URLSearchParams(this.baseURL.split('?')[1]);
for (const [k, v] of Object.entries(this.searchFilters)) {
- if (v) {
- searchParams.set(k, v);
+ if (v) {
+ if (Array.isArray(v)) {
+ searchParams.delete(k);
+ for (const e of v) {
+ searchParams.append(k, e);
+ }
+ } else {
+ searchParams.set(k, v);
+ }
}
}
const searchUrl = this.baseURL.split('?')[0] + '?' + searchParams.toString();
diff --git a/languagetool/Dockerfile b/languagetool/Dockerfile
index c4b6c0357..5f110e36e 100644
--- a/languagetool/Dockerfile
+++ b/languagetool/Dockerfile
@@ -1,9 +1,14 @@
-FROM erikvl87/languagetool:6.0-dockerupdate-3
+FROM erikvl87/languagetool:6.0-dockerupdate-3@sha256:e458281667850c4817fa91d718dbd18d0cf70460323fa561e6e77e0cd07e80a8
# PostgreSQL support
USER root
-RUN apk add postgresql-client
-RUN wget https://jdbc.postgresql.org/download/postgresql-42.5.4.jar -P libs
+RUN apk add postgresql-client zip unzip \
+ && wget https://jdbc.postgresql.org/download/postgresql-42.5.4.jar -P libs --quiet \
+ && mkdir -p org/languagetool/server \
+ && unzip -p languagetool-server.jar org/languagetool/server/mybatis-config.xml | \
+ sed '/^\s*<\/dataSource>/i' \
+ > org/languagetool/server/mybatis-config.xml \
+ && zip -u languagetool-server.jar org/languagetool/server/mybatis-config.xml
COPY scripts/* .
COPY wordlists /custom-wordlists/
diff --git a/packages/pdfviewer/src/index.js b/packages/pdfviewer/src/index.js
index bd288935f..dee006cc1 100644
--- a/packages/pdfviewer/src/index.js
+++ b/packages/pdfviewer/src/index.js
@@ -67,6 +67,10 @@ async function webViewerLoad() {
});
window.addEventListener('message', async (msg) => {
+ if (msg.origin !== window.origin) {
+ return;
+ }
+
// Save current scroll and zoom position
const scrollInfo = await PDFViewerApplication.store?.getMultiple({
page: null,