[ARVADOS] updated: b17c7d97723d99909868d3435b449ab4e95f1708

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/select_modal.js | 5 +++--
 apps/workbench/app/assets/javascripts/users.js        | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

       via  b17c7d97723d99909868d3435b449ab4e95f1708 (commit)
      from  554300e76561021bd26f9143cdece13dd80341cd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit b17c7d97723d99909868d3435b449ab4e95f1708
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jun 26 18:28:57 2015 -0400

    6440: Display AJAX errors as text, not HTML. closes #6440

diff --git a/apps/workbench/app/assets/javascripts/select_modal.js b/apps/workbench/app/assets/javascripts/select_modal.js
index d9ad7f8..17b334e 100644
--- a/apps/workbench/app/assets/javascripts/select_modal.js
+++ b/apps/workbench/app/assets/javascripts/select_modal.js
@@ -99,8 +99,9 @@ $(document).on('click', '.selectable', function() {
                 message = "Request failed.";
             }
             this.modal.find('.modal-error').
-                html('<div class="alert alert-danger">' + message + '</div>').
-                show();
+                html('<div class="alert alert-danger"></div>').
+                show().
+                children().text(message);
         }).
         done(function(data, status, jqxhr) {
             var event_name = this.action_data.success;
diff --git a/apps/workbench/app/assets/javascripts/users.js b/apps/workbench/app/assets/javascripts/users.js
index ee1c7dd..481f46f 100644
--- a/apps/workbench/app/assets/javascripts/users.js
+++ b/apps/workbench/app/assets/javascripts/users.js
@@ -29,7 +29,7 @@ $(document).
            if (response.errors) {
                error_div.html($('<p/>').text(response.errors).html());
            } else {
-               error_div.html('<p>Sorry, request failed.');
+               error_div.html('<p>Sorry, request failed.</p>');
            }
            error_div.show();
            $($('input[name=disable_element]', e.target).val()).

-----------------------------------------------------------------------


hooks/post-receive
--