paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 20:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

bookend: Hide re-subscribe button for private streams.

Browse Source 
Fixes #5181
This commit is contained in:
Cory Lynch
2017-06-20 20:20:33 -04:00
committed by showell
parent 5e611826da
commit ff9498f85b
3 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
frontend_tests/node_tests/message_list.js
View File

@@ -294,9 +294,10 @@ var MessageList = require('js/message_list').MessageList;
global.with_stub(function (stub) {
list.view.render_trailing_bookend = stub.f;
list.update_trailing_bookend();
var bookend = stub.get_args('content', 'subscribed');
var bookend = stub.get_args('content', 'subscribed', 'show_button');
assert.equal(bookend.content, expected);
assert.equal(bookend.subscribed, true);
assert.equal(bookend.show_button, true);
});
expected = "You unsubscribed from stream IceCream";
@@ -305,12 +306,36 @@ var MessageList = require('js/message_list').MessageList;
return false;
});
override("stream_data.get_sub", function () {
return {invite_only: false};
});
global.with_stub(function (stub) {
list.view.render_trailing_bookend = stub.f;
list.update_trailing_bookend();
var bookend = stub.get_args('content', 'subscribed');
var bookend = stub.get_args('content', 'subscribed', 'show_button');
assert.equal(bookend.content, expected);
assert.equal(bookend.subscribed, false);
assert.equal(bookend.show_button, true);
});
// Test when the stream is privates (invite only)
expected = "You unsubscribed from stream IceCream";
override("stream_data.is_subscribed", function () {
return false;
});
override("stream_data.get_sub", function () {
return {invite_only: true};
});
global.with_stub(function (stub) {
list.view.render_trailing_bookend = stub.f;
list.update_trailing_bookend();
var bookend = stub.get_args('content', 'subscribed', 'show_button');
assert.equal(bookend.content, expected);
assert.equal(bookend.subscribed, false);
assert.equal(bookend.show_button, false);
});
expected = "You are not subscribed to stream IceCream";
@@ -319,9 +344,10 @@ var MessageList = require('js/message_list').MessageList;
global.with_stub(function (stub) {
list.view.render_trailing_bookend = stub.f;
list.update_trailing_bookend();
var bookend = stub.get_args('content', 'subscribed');
var bookend = stub.get_args('content', 'subscribed', 'show_button');
assert.equal(bookend.content, expected);
assert.equal(bookend.subscribed, false);
assert.equal(bookend.show_button, true);
});
});
}());

6
static/js/message_list.js
View File

@@ -384,18 +384,22 @@ exports.MessageList.prototype = {
return;
}
var trailing_bookend_content;
var show_button = true;
var subscribed = stream_data.is_subscribed(stream);
if (subscribed) {
trailing_bookend_content = this.subscribed_bookend_content(stream);
} else {
if (!this.last_message_historical) {
trailing_bookend_content = this.unsubscribed_bookend_content(stream);
// For invite only streams, hide the resubscribe button
show_button = !stream_data.get_sub(stream).invite_only;
} else {
trailing_bookend_content = this.not_subscribed_bookend_content(stream);
}
}
if (trailing_bookend_content !== undefined) {
this.view.render_trailing_bookend(trailing_bookend_content, subscribed);
this.view.render_trailing_bookend(trailing_bookend_content, subscribed, show_button);
}
},

4
static/js/message_list_view.js
View File

@@ -934,10 +934,10 @@ MessageListView.prototype = {
},
render_trailing_bookend: function MessageListView_render_trailing_bookend(
trailing_bookend_content, subscribed) {
trailing_bookend_content, subscribed, show_button) {
var rendered_trailing_bookend = $(templates.render('bookend', {
bookend_content: trailing_bookend_content,
trailing: true,
trailing: show_button,
subscribed: subscribed,
}));
rows.get_table(this.table_name).append(rendered_trailing_bookend);