mirror of https://github.com/zulip/zulip.git
streams: Rename change_change_subscription_type to reference permissions.
This is a preparatory refactor for when we start having other permissions options available in this UI (e.g. announcement-only streams).
This commit is contained in:
parent
9df3480263
commit
106d06b235
|
@ -328,7 +328,7 @@ run_test('admin_options', () => {
|
|||
var sub = make_sub();
|
||||
stream_data.update_calculated_fields(sub);
|
||||
assert(!sub.is_admin);
|
||||
assert(!sub.can_change_subscription_type);
|
||||
assert(!sub.can_change_stream_permissions);
|
||||
|
||||
// just a sanity check that we leave "normal" fields alone
|
||||
assert.equal(sub.color, 'blue');
|
||||
|
@ -340,7 +340,7 @@ run_test('admin_options', () => {
|
|||
sub = make_sub();
|
||||
stream_data.update_calculated_fields(sub);
|
||||
assert(sub.is_admin);
|
||||
assert(sub.can_change_subscription_type);
|
||||
assert(sub.can_change_stream_permissions);
|
||||
|
||||
// admins can only make private streams become public
|
||||
// if they are subscribed
|
||||
|
@ -349,14 +349,14 @@ run_test('admin_options', () => {
|
|||
sub.subscribed = false;
|
||||
stream_data.update_calculated_fields(sub);
|
||||
assert(sub.is_admin);
|
||||
assert(!sub.can_change_subscription_type);
|
||||
assert(!sub.can_change_stream_permissions);
|
||||
|
||||
sub = make_sub();
|
||||
sub.invite_only = true;
|
||||
sub.subscribed = true;
|
||||
stream_data.update_calculated_fields(sub);
|
||||
assert(sub.is_admin);
|
||||
assert(sub.can_change_subscription_type);
|
||||
assert(sub.can_change_stream_permissions);
|
||||
});
|
||||
|
||||
run_test('stream_settings', () => {
|
||||
|
|
|
@ -1224,7 +1224,7 @@ run_test('handlebars_bug', () => {
|
|||
render_subscribers: true,
|
||||
color: 'purple',
|
||||
invite_only: true,
|
||||
can_change_subscription_type: true,
|
||||
can_change_stream_permissions: true,
|
||||
email_address: 'xxxxxxxxxxxxxxx@zulip.com',
|
||||
stream_id: 888,
|
||||
in_home_view: true,
|
||||
|
|
|
@ -206,7 +206,7 @@ exports.update_calculated_fields = function (sub) {
|
|||
sub.should_display_subscription_button = !sub.invite_only || sub.subscribed;
|
||||
sub.should_display_preview_button = sub.subscribed || !sub.invite_only ||
|
||||
sub.previously_subscribed;
|
||||
sub.can_change_subscription_type = page_params.is_admin && (
|
||||
sub.can_change_stream_permissions = page_params.is_admin && (
|
||||
!sub.invite_only || sub.subscribed);
|
||||
// User can add other users to stream if stream is public or user is subscribed to stream.
|
||||
sub.can_access_subscribers = !sub.invite_only || sub.subscribed || page_params.is_admin;
|
||||
|
|
|
@ -383,7 +383,7 @@ function change_stream_privacy(e) {
|
|||
|
||||
// For auto update, without rendering whole template
|
||||
stream_data.update_calculated_fields(sub);
|
||||
if (!sub.can_change_subscription_type) {
|
||||
if (!sub.can_change_stream_permissions) {
|
||||
$(".change-stream-privacy").hide();
|
||||
}
|
||||
},
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
<div class="subscription-type-text">
|
||||
{{partial "subscription_type"}}
|
||||
</div>
|
||||
{{#if can_change_subscription_type}}
|
||||
{{#if can_change_stream_permissions}}
|
||||
<a class="change-stream-privacy">[{{t "Change" }}]</a>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue