Merge pull request #439 from ucsd-ets/release-candidate

release-2020-10-12
ucsd-ets · Oct 14, 2020 · 1b7460c · 1b7460c
2 parents 36ca1b3 + dd4aab2
commit 1b7460c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/lms/static/js/instructor_dashboard/send_email.js b/lms/static/js/instructor_dashboard/send_email.js
@@ -136,6 +136,9 @@
                     url: url,
                     success: function(data) {
                         if (data.tasks.length) {
+                            sendemail.$history_request_response_error.css({
+                                display: 'none'
+                            });
                             return createTaskListTable(sendemail.$table_task_history_email, data.tasks);
                         } else {
                             sendemail.$history_request_response_error.text(
@@ -146,10 +149,13 @@
                             });
                         }
                     },
-                    error: statusAjaxError(function() {
-                        return sendemail.$history_request_response_error.text(
+                    error: statusAjaxError(function () {
+                        sendemail.$history_request_response_error.text(
                             gettext('There was an error obtaining email task history for this course.')
                         );
+                        return sendemail.$history_request_response_error.css({
+                            display: 'block'
+                        });
                     })
                 });
             });
@@ -161,6 +167,9 @@
                     url: url,
                     success: function(data) {
                         if (data.emails.length) {
+                            sendemail.$content_request_response_error.css({
+                                display: 'none'
+                            });
                             createEmailContentTable(sendemail.$table_email_content_history,
                                 sendemail.$email_content_table_inner, data.emails
                             );
@@ -174,10 +183,13 @@
                             });
                         }
                     },
-                    error: statusAjaxError(function() {
-                        return sendemail.$content_request_response_error.text(
+                    error: statusAjaxError(function () {
+                        sendemail.$content_request_response_error.text(
                             gettext('There was an error obtaining email content history for this course.')
                         );
+                        return sendemail.$content_request_response_error.css({
+                            display: 'block'
+                        });
                     })
                 });
             });

diff --git a/lms/static/js/instructor_dashboard/util.js b/lms/static/js/instructor_dashboard/util.js
@@ -239,7 +239,7 @@
         });
         $tableEmailsInner.append($tablePlaceholder);
         Slick.Grid($tablePlaceholder, tableData, columns, options);
-        return $tableEmails.append($('<br/>'));
+        return $tableEmails;
     };
 
     createEmailMessageViews = function($messagesWrapper, emails) {

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
@@ -179,7 +179,7 @@ numpy==1.6.2
 oauth2==1.9.0.post1
 oauthlib==2.1.0
 openapi-codec==1.3.2      # via django-rest-swagger
-openedx-caliper-tracking==0.14.2
+openedx-caliper-tracking==0.14.3
 path.py==8.2.1
 pathtools==0.1.2
 paver==1.3.4