paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-18 21:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate transitional email forwarding flags

Browse Source 
(imported from commit cc9305e554a381de5a36b7c353bbf53b71b2d43c)
This commit is contained in:
Steve Howell
2013-09-24 11:50:31 -04:00
committed by Zev Benjamin
parent c5f8ffc767
commit 9df7ee454d
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
static/js/feature_flags.js
View File

@@ -8,7 +8,6 @@ exports.summarize_read_while_narrowed = true;
exports.twenty_four_hour_time = _.contains([], exports.twenty_four_hour_time = _.contains([],
page_params.email); page_params.email);
exports.dropbox_integration = page_params.staging || _.contains(['dropbox.com'], page_params.domain); exports.dropbox_integration = page_params.staging || _.contains(['dropbox.com'], page_params.domain);
exports.email_forwarding = true;
exports.mandatory_topics = _.contains([ exports.mandatory_topics = _.contains([
'customer7.invalid' 'customer7.invalid'

6
static/js/subs.js
View File

@@ -224,8 +224,7 @@ function add_email_hint(row) {
function add_sub_to_table(sub) { function add_sub_to_table(sub) {
$('#create_stream_row').after(templates.render( $('#create_stream_row').after(templates.render(
'subscription', 'subscription',
_.extend(sub, {'show_email_token': feature_flags.email_forwarding, _.extend(sub, {'allow_rename': page_params.show_admin})));
'allow_rename': page_params.show_admin})));
settings_for_sub(sub).collapse('show'); settings_for_sub(sub).collapse('show');
add_email_hint(sub); add_email_hint(sub);
} }
@@ -427,9 +426,6 @@ exports.setup_page = function () {
sub = create_sub(stream, {subscribed: false}); sub = create_sub(stream, {subscribed: false});
} }
sub = _.extend(sub, {'allow_rename': page_params.show_admin}); sub = _.extend(sub, {'allow_rename': page_params.show_admin});
if (feature_flags.email_forwarding) {
sub = _.extend(sub, {'show_email_token': feature_flags.email_forwarding});
}
sub_rows.push(sub); sub_rows.push(sub);
}); });

4
static/templates/subscription.handlebars
View File

@@ -44,12 +44,12 @@
</li> </li>
</ul> </ul>
</div> </div>
{{#if_and show_email_token subscribed}} {{#if subscribed}}
<div> <div>
<p><b>Email address</b>: <span class="email-address">{{email_address}} <p><b>Email address</b>: <span class="email-address">{{email_address}}
<i class="icon-vector-question-sign" id="email-address-hint-{{id}}"></i></span></p> <i class="icon-vector-question-sign" id="email-address-hint-{{id}}"></i></span></p>
</div> </div>
{{/if_and}} {{/if}}
{{#if allow_rename}} {{#if allow_rename}}
<div class="rename-stream"> <div class="rename-stream">