Skip to content

Commit

Permalink
settings_org: Extract settings_components module.
Browse files Browse the repository at this point in the history
Signed-off-by: Anders Kaseorg <[email protected]>
  • Loading branch information
andersk authored and timabbott committed Oct 10, 2023
1 parent 9ab1a72 commit 3cac29a
Show file tree
Hide file tree
Showing 9 changed files with 813 additions and 730 deletions.
1 change: 1 addition & 0 deletions tools/test-js-with-node
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ EXEMPT_FILES = make_set(
"web/src/settings.js",
"web/src/settings_account.js",
"web/src/settings_bots.js",
"web/src/settings_components.js",
"web/src/settings_display.js",
"web/src/settings_emoji.ts",
"web/src/settings_exports.ts",
Expand Down
15 changes: 9 additions & 6 deletions web/src/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {page_params} from "./page_params";
import {realm_user_settings_defaults} from "./realm_user_settings_defaults";
import * as settings from "./settings";
import * as settings_bots from "./settings_bots";
import * as settings_components from "./settings_components";
import * as settings_config from "./settings_config";
import * as settings_data from "./settings_data";
import * as settings_invites from "./settings_invites";
Expand Down Expand Up @@ -116,12 +117,14 @@ export function build_page() {
realm_add_custom_emoji_policy: page_params.realm_add_custom_emoji_policy,
can_add_emojis: settings_data.user_can_add_custom_emoji(),
can_create_new_bots: settings_bots.can_create_new_bots(),
realm_message_content_edit_limit_minutes: settings_org.get_realm_time_limits_in_minutes(
"realm_message_content_edit_limit_seconds",
),
realm_message_content_delete_limit_minutes: settings_org.get_realm_time_limits_in_minutes(
"realm_message_content_delete_limit_seconds",
),
realm_message_content_edit_limit_minutes:
settings_components.get_realm_time_limits_in_minutes(
"realm_message_content_edit_limit_seconds",
),
realm_message_content_delete_limit_minutes:
settings_components.get_realm_time_limits_in_minutes(
"realm_message_content_delete_limit_seconds",
),
realm_message_retention_days: page_params.realm_message_retention_days,
realm_allow_edit_history: page_params.realm_allow_edit_history,
realm_allow_message_editing: page_params.realm_allow_message_editing,
Expand Down
Loading

0 comments on commit 3cac29a

Please sign in to comment.