diff --git a/docs/production/security-model.md b/docs/production/security-model.md index 95b5281c49..56fecd2998 100644 --- a/docs/production/security-model.md +++ b/docs/production/security-model.md @@ -139,7 +139,7 @@ strength allowed is controlled by two settings in and bots. * Owners and administrators have the ability to deactivate and - reactivate other human and bot users, delete streams, add/remove + reactivate other human and bot users, archive streams, add/remove administrator privileges, as well as change configuration for the organization. diff --git a/frontend_tests/node_tests/stream_data.js b/frontend_tests/node_tests/stream_data.js index a9db1ccf21..6f6cf9bbde 100644 --- a/frontend_tests/node_tests/stream_data.js +++ b/frontend_tests/node_tests/stream_data.js @@ -418,7 +418,7 @@ test("delete_sub", () => { assert(!stream_data.get_sub("Canada")); assert(!stream_data.get_sub_by_id(canada.stream_id)); - blueslip.expect("warn", "Failed to delete stream 99999"); + blueslip.expect("warn", "Failed to archive stream 99999"); stream_data.delete_sub(99999); }); diff --git a/static/js/stream_data.js b/static/js/stream_data.js index af4495413e..b162ae213f 100644 --- a/static/js/stream_data.js +++ b/static/js/stream_data.js @@ -356,7 +356,7 @@ export function slug_to_name(slug) { export function delete_sub(stream_id) { const sub = subs_by_stream_id.get(stream_id); if (!sub) { - blueslip.warn("Failed to delete stream " + stream_id); + blueslip.warn("Failed to archive stream " + stream_id); return; } subs_by_stream_id.delete(stream_id); diff --git a/static/js/stream_edit.js b/static/js/stream_edit.js index 222f2c69b7..58c957a29f 100644 --- a/static/js/stream_edit.js +++ b/static/js/stream_edit.js @@ -688,7 +688,7 @@ export function change_stream_description(e) { }); } -export function delete_stream(stream_id, alert_element, stream_row) { +export function archive_stream(stream_id, alert_element, stream_row) { channel.del({ url: "/json/streams/" + stream_id, error(xhr) { @@ -874,7 +874,7 @@ export function initialize() { return; } const row = $(".stream-row.active"); - delete_stream(stream_id, $(".stream_change_property_info"), row); + archive_stream(stream_id, $(".stream_change_property_info"), row); }); $("#subscriptions_table").on("click", ".stream-row", function (e) { diff --git a/static/templates/settings/deactivation_stream_modal.hbs b/static/templates/settings/deactivation_stream_modal.hbs index ca9c50c48f..6b7a4072c8 100644 --- a/static/templates/settings/deactivation_stream_modal.hbs +++ b/static/templates/settings/deactivation_stream_modal.hbs @@ -1,13 +1,13 @@ diff --git a/static/templates/subscription_settings.hbs b/static/templates/subscription_settings.hbs index cc4bec31be..68ad969abe 100644 --- a/static/templates/subscription_settings.hbs +++ b/static/templates/subscription_settings.hbs @@ -16,7 +16,7 @@
{{#if is_realm_admin}} - + {{/if}}