Merge pull request #586 from magopian/1175060-updateURL-allowed-for-u…

…nlisted-addons fix regression: updateURL should be allowed for unlisted addons (bug 1175060)
mozilla · Jun 16, 2015 · 83d149a · 83d149a
2 parents aa1a428 + 2d3f162
commit 83d149a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/static/js/common/upload-addon.js b/static/js/common/upload-addon.js
@@ -265,8 +265,8 @@
                 // If the addon is detected as beta, automatically check
                 // the "beta" input, but only if the addon is listed.
                 var $new_form = $('.new-addon-file');
-                var isUnlisted = $('#id_is_unlisted').is(':checked') || !$new_form.data('addon-is-listed')
-                  var $beta = $('#id_beta');
+                var isUnlisted = ($('#id_is_unlisted').length && $('#id_is_unlisted').is(':checked')) || !$new_form.data('addon-is-listed')
+                var $beta = $('#id_beta');
                 if (results.beta && !isUnlisted) {
                   $beta.prop('checked', true);
                   $('.beta-status').show();

diff --git a/static/js/zamboni/devhub.js b/static/js/zamboni/devhub.js
@@ -97,7 +97,7 @@ $(document).ready(function() {
       var $isManualReview = $('#manual-review');
       var $submitAddonProgress = $('.submit-addon-progress');
       function updateListedStatus() {
-        if (!$isUnlisted.is(':checked') || $new_form.data('addon-is-listed')) {  // It's a listed add-on.
+        if (($isUnlisted.length && !$isUnlisted.is(':checked')) || $new_form.data('addon-is-listed')) {  // It's a listed add-on.
           $uploadAddon.attr('data-upload-url', $uploadAddon.attr('data-upload-url-listed'));
           $betaWarningLabel.hide();
           $isSideloadLabel.hide();