Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EDUCATOR-2224 Discussion Topic with no posts have message.

Browse Source
This commit is contained in:
attiyaishaque
2018-02-01 17:42:57 +05:00
parent 4cdff4518f
commit 9704146e40
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
common/static/common/js/discussion/views/discussion_thread_list_view.js
View File

@@ -223,6 +223,10 @@
$content = this.renderThread(thread);
this.$('.forum-nav-thread-list').append($content);
}
if (this.$('.forum-nav-thread-list li').length === 0) {
this.clearSearchAlerts();
this.addSearchAlert(gettext('There are no posts in this topic yet.'));
}
this.showMetadataAccordingToSort();
this.renderMorePages();
this.trigger('threads:rendered');
@@ -450,7 +454,8 @@
DiscussionThreadListView.prototype.retrieveFirstPage = function(event) {
this.collection.current_page = 0;
this.collection.reset();
this.$('.forum-nav-thread-list').empty();
this.collection.models = [];
return this.loadMorePages(event);
};
@@ -507,6 +512,7 @@
var message, noResponseMsg;
if (textStatus === 'success') {
self.collection.reset(response.discussion_data);
self.clearSearchAlerts();
Content.loadContentInfos(response.annotated_content_info);
self.collection.current_page = response.page;
self.collection.pages = response.num_pages;
@@ -533,8 +539,11 @@
self.addSearchAlert(message);
} else if (response.discussion_data.length === 0) {
self.addSearchAlert(gettext('No posts matched your query.'));
self.displayedCollection.models = [];
}
if (self.collection.models.length !== 0) {
self.displayedCollection.reset(self.collection.models);
}
self.displayedCollection.reset(self.collection.models);
if (text) {
return self.searchForUser(text);
}

9
common/static/common/js/spec/discussion/view/discussion_thread_list_view_spec.js
View File

@@ -484,6 +484,8 @@
it('renders and removes search alerts', function() {
var bar, foo;
testAlertMessages(['There are no posts in this topic yet.']);
this.view.clearSearchAlerts();
testAlertMessages([]);
foo = this.view.addSearchAlert('foo');
testAlertMessages(['foo']);
@@ -497,6 +499,8 @@
it('renders search alert with custom class', function() {
var messages;
testAlertMessages(['There are no posts in this topic yet.']);
this.view.clearSearchAlerts();
testAlertMessages([]);
this.view.addSearchAlert('foo', 'custom-class');
@@ -517,6 +521,7 @@
it('clears all search alerts', function() {
this.view.clearSearchAlerts();
this.view.addSearchAlert('foo');
this.view.addSearchAlert('bar');
this.view.addSearchAlert('baz');
@@ -553,13 +558,13 @@
it('adds a search alert when an alternate term was searched', function() {
testCorrection(this.view, 'foo');
expect(this.view.addSearchAlert.calls.count()).toEqual(1);
expect(this.view.addSearchAlert.calls.count()).toEqual(2);
return expect(this.view.addSearchAlert.calls.mostRecent().args[0]).toMatch(/foo/);
});
it('does not add a search alert when no alternate term was searched', function() {
testCorrection(this.view, null);
expect(this.view.addSearchAlert.calls.count()).toEqual(1);
expect(this.view.addSearchAlert.calls.count()).toEqual(2);
return expect(this.view.addSearchAlert.calls.mostRecent().args[0]).toMatch(/no posts matched/i);
});

3
common/test/acceptance/tests/discussion/test_discussion.py
View File

@@ -1354,6 +1354,7 @@ class DiscussionSearchAlertTest(UniqueCourseTest):
@attr(shard=2)
def test_rewrite_dismiss(self):
self.page.dismiss_alert_message("There are no posts in this topic yet.")
self.setup_corrected_text("foo")
self.page.perform_search()
self.check_search_alert_messages(["foo"])
@@ -1362,6 +1363,7 @@ class DiscussionSearchAlertTest(UniqueCourseTest):
@attr(shard=2)
def test_new_search(self):
self.page.dismiss_alert_message("There are no posts in this topic yet.")
self.setup_corrected_text("foo")
self.page.perform_search()
self.check_search_alert_messages(["foo"])
@@ -1376,6 +1378,7 @@ class DiscussionSearchAlertTest(UniqueCourseTest):
@attr(shard=2)
def test_rewrite_and_user(self):
self.page.dismiss_alert_message("There are no posts in this topic yet.")
self.setup_corrected_text("foo")
self.page.perform_search(self.SEARCHED_USERNAME)
self.check_search_alert_messages(["foo", self.SEARCHED_USERNAME])