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

Refactor search error messaging

Browse Source
This commit is contained in:
John Hensley
2018-02-14 14:12:46 -05:00
committed by Kshitij Sobti
parent df09765ee1
commit 8f5205c768
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
openedx/features/course_search/static/course_search/js/collections/search_collection.js
View File

@@ -19,13 +19,24 @@
fetchXhr: null,
initialize: function(models, options) {
// call super constructor
// call super constructor
Backbone.Collection.prototype.initialize.apply(this, arguments);
if (options && options.courseId) {
this.url += options.courseId;
}
},
extractErrorMessage: function(response) {
var errorMessage;
if (response.responseJSON && response.responseJSON.error) {
// eslint-disable-next-line no-param-reassign
errorMessage = response.responseJSON.error || '';
} else {
errorMessage = ''; // eslint-disable-line no-param-reassign
}
return errorMessage;
},
performSearch: function(searchTerm) {
if (this.fetchXhr) {
this.fetchXhr.abort();
@@ -44,14 +55,7 @@
self.trigger('search');
},
error: function(self, response) {
if (response.responseJSON && response.responseJSON.error) {
// eslint-disable-next-line no-param-reassign
self.errorMessage = response.responseJSON.error || '';
} else {
// eslint-disable-next-line no-param-reassign
self.errorMessage = '';
}
self.errorMessage = self.extractErrorMessage(response);
self.trigger('error');
}
});
@@ -74,13 +78,7 @@
self.trigger('next');
},
error: function(self, response) {
if (response.responseJSON && response.responseJSON.error) {
// eslint-disable-next-line no-param-reassign
self.errorMessage = response.responseJSON.error || '';
} else {
self.errorMessage = ''; // eslint-disable-line no-param-reassign
}
self.errorMessage = self.extractErrorMessage(response);
self.trigger('error');
},
add: true,
@@ -111,7 +109,7 @@
this.totalCount = 0;
this.latestModelsCount = 0;
this.accessDeniedCount = 0;
// empty the entire collection
// empty the entire collection
this.reset();
},