From 8f5205c76865074ff4b62856f8a4c7c2290133d5 Mon Sep 17 00:00:00 2001
From: John Hensley <john@opencraft.com>
Date: Wed, 14 Feb 2018 14:12:46 -0500
Subject: [PATCH] Refactor search error messaging

---
 .../js/collections/search_collection.js       | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/openedx/features/course_search/static/course_search/js/collections/search_collection.js b/openedx/features/course_search/static/course_search/js/collections/search_collection.js
index 778fa9bd9f..137a6acea0 100644
--- a/openedx/features/course_search/static/course_search/js/collections/search_collection.js
+++ b/openedx/features/course_search/static/course_search/js/collections/search_collection.js
@@ -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();
             },