diff --git a/templates/install.tmpl b/templates/install.tmpl
index acfafd3cc7..45f14d5c57 100644
--- a/templates/install.tmpl
+++ b/templates/install.tmpl
@@ -203,24 +203,6 @@
diff --git a/tests/mssql.ini.tmpl b/tests/mssql.ini.tmpl
index 0d16905033..6f031691f0 100644
--- a/tests/mssql.ini.tmpl
+++ b/tests/mssql.ini.tmpl
@@ -41,7 +41,6 @@ SSH_LISTEN_HOST = localhost
SSH_PORT = 2201
START_SSH_SERVER = true
LFS_START_SERVER = true
-OFFLINE_MODE = false
LFS_JWT_SECRET = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w
BUILTIN_SSH_SERVER_USER = git
SSH_TRUSTED_USER_CA_KEYS = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCb4DC1dMFnJ6pXWo7GMxTchtzmJHYzfN6sZ9FAPFR4ijMLfGki+olvOMO5Fql1/yGnGfbELQa1S6y4shSvj/5K+zUFScmEXYf3Gcr87RqilLkyk16RS+cHNB1u87xTHbETaa3nyCJeGQRpd4IQ4NKob745mwDZ7jQBH8AZEng50Oh8y8fi8skBBBzaYp1ilgvzG740L7uex6fHV62myq0SXeCa+oJUjq326FU8y+Vsa32H8A3e7tOgXZPdt2TVNltx2S9H2WO8RMi7LfaSwARNfy1zu+bfR50r6ef8Yx5YKCMz4wWb1SHU1GS800mjOjlInLQORYRNMlSwR1+vLlVDciOqFapDSbj+YOVOawR0R1aqlSKpZkt33DuOBPx9qe6CVnIi7Z+Px/KqM+OLCzlLY/RS+LbxQpDWcfTVRiP+S5qRTcE3M3UioN/e0BE/1+MpX90IGpvVkA63ILYbKEa4bM3ASL7ChTCr6xN5XT+GpVJveFKK1cfNx9ExHI4rzYE=
@@ -62,10 +61,6 @@ DEFAULT_ALLOW_CREATE_ORGANIZATION = true
NO_REPLY_ADDRESS = noreply.example.org
ENABLE_NOTIFY_MAIL = true
-[picture]
-DISABLE_GRAVATAR = false
-ENABLE_FEDERATED_AVATAR = false
-
[session]
PROVIDER = file
diff --git a/tests/mysql.ini.tmpl b/tests/mysql.ini.tmpl
index bf59efde4c..02069b403e 100644
--- a/tests/mysql.ini.tmpl
+++ b/tests/mysql.ini.tmpl
@@ -43,7 +43,6 @@ SSH_LISTEN_HOST = localhost
SSH_PORT = 2201
BUILTIN_SSH_SERVER_USER = git
START_SSH_SERVER = true
-OFFLINE_MODE = false
LFS_START_SERVER = true
LFS_JWT_SECRET = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w
@@ -65,10 +64,6 @@ DEFAULT_ALLOW_CREATE_ORGANIZATION = true
NO_REPLY_ADDRESS = noreply.example.org
ENABLE_NOTIFY_MAIL = true
-[picture]
-DISABLE_GRAVATAR = false
-ENABLE_FEDERATED_AVATAR = false
-
[session]
PROVIDER = file
diff --git a/tests/pgsql.ini.tmpl b/tests/pgsql.ini.tmpl
index b6fcd33f70..50a649fc79 100644
--- a/tests/pgsql.ini.tmpl
+++ b/tests/pgsql.ini.tmpl
@@ -42,7 +42,6 @@ SSH_LISTEN_HOST = localhost
SSH_PORT = 2202
START_SSH_SERVER = true
LFS_START_SERVER = true
-OFFLINE_MODE = false
LFS_JWT_SECRET = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w
BUILTIN_SSH_SERVER_USER = git
SSH_TRUSTED_USER_CA_KEYS = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCb4DC1dMFnJ6pXWo7GMxTchtzmJHYzfN6sZ9FAPFR4ijMLfGki+olvOMO5Fql1/yGnGfbELQa1S6y4shSvj/5K+zUFScmEXYf3Gcr87RqilLkyk16RS+cHNB1u87xTHbETaa3nyCJeGQRpd4IQ4NKob745mwDZ7jQBH8AZEng50Oh8y8fi8skBBBzaYp1ilgvzG740L7uex6fHV62myq0SXeCa+oJUjq326FU8y+Vsa32H8A3e7tOgXZPdt2TVNltx2S9H2WO8RMi7LfaSwARNfy1zu+bfR50r6ef8Yx5YKCMz4wWb1SHU1GS800mjOjlInLQORYRNMlSwR1+vLlVDciOqFapDSbj+YOVOawR0R1aqlSKpZkt33DuOBPx9qe6CVnIi7Z+Px/KqM+OLCzlLY/RS+LbxQpDWcfTVRiP+S5qRTcE3M3UioN/e0BE/1+MpX90IGpvVkA63ILYbKEa4bM3ASL7ChTCr6xN5XT+GpVJveFKK1cfNx9ExHI4rzYE=
@@ -63,10 +62,6 @@ DEFAULT_ALLOW_CREATE_ORGANIZATION = true
NO_REPLY_ADDRESS = noreply.example.org
ENABLE_NOTIFY_MAIL = true
-[picture]
-DISABLE_GRAVATAR = false
-ENABLE_FEDERATED_AVATAR = false
-
[session]
PROVIDER = file
diff --git a/tests/sqlite.ini.tmpl b/tests/sqlite.ini.tmpl
index 243bea86f1..b43b658bb0 100644
--- a/tests/sqlite.ini.tmpl
+++ b/tests/sqlite.ini.tmpl
@@ -37,7 +37,6 @@ SSH_LISTEN_HOST = localhost
SSH_PORT = 2203
START_SSH_SERVER = true
LFS_START_SERVER = true
-OFFLINE_MODE = false
LFS_JWT_SECRET = Tv_MjmZuHqpIY6GFl12ebgkRAMt4RlWt0v4EHKSXO0w
ENABLE_GZIP = true
BUILTIN_SSH_SERVER_USER = git
@@ -59,10 +58,6 @@ DEFAULT_KEEP_EMAIL_PRIVATE = false
DEFAULT_ALLOW_CREATE_ORGANIZATION = true
NO_REPLY_ADDRESS = noreply.example.org
-[picture]
-DISABLE_GRAVATAR = false
-ENABLE_FEDERATED_AVATAR = false
-
[session]
PROVIDER = file
diff --git a/web_src/js/features/admin/config.test.ts b/web_src/js/features/admin/config.test.ts
index e44ccb2a94..3de524070c 100644
--- a/web_src/js/features/admin/config.test.ts
+++ b/web_src/js/features/admin/config.test.ts
@@ -7,10 +7,15 @@ test('ConfigFormValueMapper', () => {
+
+
+
+
+
@@ -35,6 +40,8 @@ test('ConfigFormValueMapper', () => {
expect(result).toEqual({
'k1': 'true',
'k2': '"k2-val"',
+ 'k-flipped-false': 'false',
+ 'k-flipped-true': 'true',
'repository.open-with.editor-apps': '[{"DisplayName":"a","OpenURL":"b"}]', // TODO: OPEN-WITH-EDITOR-APP-JSON: it must match backend
'struct': '{"SubBoolean":true,"SubTimestamp":123456780,"OtherKey":"other-value","NewKey":"new-value"}',
});
diff --git a/web_src/js/features/admin/config.ts b/web_src/js/features/admin/config.ts
index 047c1a46a4..5df81412f9 100644
--- a/web_src/js/features/admin/config.ts
+++ b/web_src/js/features/admin/config.ts
@@ -6,14 +6,23 @@ import {submitFormFetchAction} from '../common-fetch-action.ts';
const {appSubUrl} = window.config;
+function collectCheckboxBooleanValue(el: HTMLInputElement): boolean {
+ const valType = el.getAttribute('data-config-value-type') as ConfigValueType;
+ if (valType === 'boolean') return el.checked;
+ if (valType === 'flipped') return !el.checked;
+ requireExplicitValueType(el);
+}
+
function initSystemConfigAutoCheckbox(el: HTMLInputElement) {
el.addEventListener('change', async () => {
// if the checkbox is inside a form, we assume it's handled by the form submit and do not send an individual request
if (el.closest('form')) return;
try {
- const resp = await POST(`${appSubUrl}/-/admin/config`, {
- data: new URLSearchParams({key: el.getAttribute('data-config-dyn-key')!, value: String(el.checked)}),
+ const data = new URLSearchParams({
+ key: el.getAttribute('data-config-dyn-key')!,
+ value: String(collectCheckboxBooleanValue(el)),
});
+ const resp = await POST(`${appSubUrl}/-/admin/config`, {data});
const json: Record = await resp.json();
if (json.errorMessage) throw new Error(json.errorMessage);
} catch (ex) {
@@ -47,7 +56,7 @@ function extractElemConfigSubKey(el: GeneralFormFieldElement, dynKey: string): s
// Due to the different design between HTML form elements and the JSON struct of the config values, we need to explicitly define some types.
// * checkbox can be used for boolean value, it can also be used for multiple values (array)
-type ConfigValueType = 'boolean' | 'string' | 'number' | 'timestamp'; // TODO: support more types like array, not used at the moment.
+type ConfigValueType = 'boolean' | 'flipped' | 'string' | 'number' | 'timestamp'; // TODO: support more types like array, not used at the moment.
function toDatetimeLocalValue(unixSeconds: number) {
const d = new Date(unixSeconds * 1000);
@@ -102,13 +111,14 @@ export class ConfigFormValueMapper {
return true;
}
- collectConfigValueFromElement(el: GeneralFormFieldElement, _oldVal: any = null) {
+ collectConfigValueFromElement(el: GeneralFormFieldElement) {
let val: any;
const valType = this.presetValueTypes[el.name];
if (el.matches('[type="checkbox"]')) {
- if (valType !== 'boolean') requireExplicitValueType(el);
- val = el.checked;
- // oldVal: for future use when we support array value with checkbox
+ // TODO: if it needs to support array values in the future,
+ // it needs to iterate the "namedElems" to find all the checkboxes with the same name and collect values accordingly,
+ // and set the namedElems[matchedIdx] to null to avoid duplicate processing.
+ val = collectCheckboxBooleanValue(el);
} else if (el.matches('[type="datetime-local"]')) {
if (valType !== 'timestamp') requireExplicitValueType(el);
val = Math.floor(new Date(el.value).getTime() / 1000) ?? 0; // NaN is fine to JSON.stringify, it becomes null.
@@ -128,7 +138,7 @@ export class ConfigFormValueMapper {
if (!el) continue;
const subKey = extractElemConfigSubKey(el, dynKey);
if (!subKey) continue; // if not match, skip
- cfgVal[subKey] = this.collectConfigValueFromElement(el, cfgVal[subKey]);
+ cfgVal[subKey] = this.collectConfigValueFromElement(el);
namedElems[idx] = null;
}
}
@@ -180,6 +190,7 @@ export class ConfigFormValueMapper {
// now, the namedElems should only contain the config options without sub values,
// directly store the value in formData with key as the element name, for example:
+ // "foo.enabled" => "true"
for (const el of namedElems) {
if (!el) continue;
const dynKey = el.name;
diff --git a/web_src/js/features/install.ts b/web_src/js/features/install.ts
index c00fe3c03d..f316cd532d 100644
--- a/web_src/js/features/install.ts
+++ b/web_src/js/features/install.ts
@@ -60,25 +60,6 @@ function initPreInstall() {
}
// TODO: better handling of exclusive relations.
- document.querySelector('#offline-mode input')!.addEventListener('change', function () {
- if (this.checked) {
- document.querySelector('#disable-gravatar input')!.checked = true;
- document.querySelector('#federated-avatar-lookup input')!.checked = false;
- }
- });
- document.querySelector('#disable-gravatar input')!.addEventListener('change', function () {
- if (this.checked) {
- document.querySelector('#federated-avatar-lookup input')!.checked = false;
- } else {
- document.querySelector('#offline-mode input')!.checked = false;
- }
- });
- document.querySelector('#federated-avatar-lookup input')!.addEventListener('change', function () {
- if (this.checked) {
- document.querySelector('#disable-gravatar input')!.checked = false;
- document.querySelector('#offline-mode input')!.checked = false;
- }
- });
document.querySelector('#enable-openid-signin input')!.addEventListener('change', function () {
if (this.checked) {
if (!document.querySelector('#disable-registration input')!.checked) {