Merge pull request #475 from magopian/1139674-addon-validation-page-t…

…runcated-message Don't fail on warnings truncation on the addon validation page (bug 1139674)
mozilla · Mar 16, 2015 · 828a4cb · 828a4cb
2 parents 8cefaa1 + 4a1aec0
commit 828a4cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/apps/devhub/utils.py b/apps/devhub/utils.py
@@ -54,6 +54,8 @@ def limit_validation_results(validation, is_compatibility=False):
             validation['messages'].append({
                 'tier': 1,
                 'type': msgtype,
+                # To respect the message structure, see bug 1139674.
+                'id': ['validation', 'messages', 'truncated'],
                 'message': (_('Validation generated too many errors/'
                               'warnings so %s messages were truncated. '
                               'After addressing the visible messages, '

diff --git a/static/js/common/upload-addon.js b/static/js/common/upload-addon.js
@@ -341,7 +341,9 @@
                             ], current, matched, messages = [],
                             // this.id is in the form ["testcases_javascript_instanceactions", "_call_expression", "createelement_variable"],
                             // we usually only match one of the elements.
-                            matchId = function (id) {return _.contains(this.id, id);};
+                            matchId = function (id) {
+                              return this.hasOwnProperty('id') && _.contains(this.id, id);
+                            };
 
                         if (!upload_results.parents('.add-file-modal').length) {
                             // We are uploading a file for an existing addon.