update install buttons for navigator.mozApps.installPackage w/ mini manifests (bug 792146)

Author: cvan

media/js/mkt/apps.js

@@ -39,19 +39,18 @@ exports.install = function(product, opt) {
     var self = apps,
         errSummary,
         manifestUrl = product.manifestUrl,
-        package_url = product.package_url,
         $def = $.Deferred();
 
     /* Try and install the app. */
     if (manifestUrl && opt.navigator.mozApps && opt.navigator.mozApps.install) {
         /* TODO: combine the following check with the above. But don't stop
          * clients without installPackage from using apps for now.
          */
-        if (product.is_packaged && !opt.navigator.mozApps.installPackage && !package_url) {
+        if (product.is_packaged && !opt.navigator.mozApps.installPackage && !manifestUrl) {
             $def.reject();
         }
         var installRequest = product.is_packaged ?
-                             opt.navigator.mozApps.installPackage(package_url, opt.data) :
+                             opt.navigator.mozApps.installPackage(manifestUrl, opt.data) :
                              opt.navigator.mozApps.install(manifestUrl, opt.data);
         installRequest.onsuccess = function() {
             $def.resolve(product);

mkt/developers/templates/developers/apps/edit/basic.html

@@ -54,7 +54,7 @@ <h2>
           <th class="label">{{ _('Manifest URL') }}</th>
           <td>
             {% if addon.is_packaged %}
-                <a href="{{ addon.get_detail_url('manifest')|absolutify }}" target="_blank">{{ addon.get_detail_url('manifest')|absolutify }}</a>
+                <a href="{{ addon.get_manifest_url() }}" target="_blank">{{ addon.get_manifest_url() }}</a>
             {% else %}
               {% if editable %}
                 <input type="text" name="manifest_url"{{ ' readonly' if not action_allowed('Admin', '%') }} value="{{ addon.manifest_url }}">

mkt/site/helpers.py

@@ -106,25 +106,20 @@ def product_as_dict(request, product, purchased=None, receipt_type=None):
     url = (reverse('receipt.issue', args=[product.app_slug])
            if receipt_type else product.get_detail_url('record'))
     src = request.GET.get('src', '')
-    if product.is_packaged and product.current_version:
-        package_url = product.current_version.all_files[0].get_url_path(src)
-    else:
-        package_url = ''
 
     ret = {
         'id': product.id,
         'name': product.name,
         'categories': [unicode(cat.name) for cat in
                        product.categories.all()],
-        'manifestUrl': product.manifest_url,
+        'manifestUrl': product.get_manifest_url(),
         'preapprovalUrl': reverse('detail.purchase.preapproval',
                                   args=[product.app_slug]),
         'recordUrl': urlparams(url, src=src),
         'author': author,
         'author_url': author_url,
         'iconUrl': product.get_icon_url(64),
         'is_packaged': product.is_packaged,
-        'package_url': package_url,
     }
 
     # Add in previews to the dict.

mkt/site/tests/test_helpers.py

@@ -138,18 +138,20 @@ def test_category(self):
         eq_(data['categories'],
             [str(cat.name) for cat in self.webapp.categories.all()])
 
+    @mock.patch.object(settings, 'SITE_URL', 'http://omg.org/yes')
     def test_is_packaged(self):
         self.webapp.update(is_packaged=True)
         doc = pq(market_tile(self.context, self.webapp))
         data = json.loads(doc('a').attr('data-product'))
         eq_(data['is_packaged'], True)
-        assert data['package_url'].startswith('/downloads')
+        eq_(data['manifestUrl'],
+            'http://omg.org/yes' + self.webapp.get_detail_url('manifest'))
 
     def test_is_not_packaged(self):
         doc = pq(market_tile(self.context, self.webapp))
         data = json.loads(doc('a').attr('data-product'))
         eq_(data['is_packaged'], False)
-        eq_(data['package_url'], '')
+        eq_(data['manifestUrl'], self.webapp.manifest_url)
 
     def test_packaged_no_valid_status(self):
         self.webapp.update(is_packaged=True)
@@ -160,7 +162,7 @@ def test_packaged_no_valid_status(self):
         doc = pq(market_tile(self.context, self.webapp))
         data = json.loads(doc('a').attr('data-product'))
         eq_(data['is_packaged'], True)
-        eq_(data['package_url'], '')
+        eq_(data['manifestUrl'], '')
         # The install button should not be shown if no current_version.
         eq_(doc('.product button').length, 0)
 

mkt/webapps/models.py

@@ -28,6 +28,7 @@
                            update_name_table, update_search_index)
 from addons.signals import version_changed
 from amo.decorators import skip_cache
+from amo.helpers import absolutify
 from amo.storage_utils import copy_stored_file
 from amo.urlresolvers import reverse
 from amo.utils import JSONEncoder, smart_path
@@ -259,6 +260,22 @@ def origin(self):
         parsed = urlparse.urlparse(self.manifest_url)
         return '%s://%s' % (parsed.scheme, parsed.netloc)
 
+    def get_manifest_url(self):
+        """
+        Hosted apps: a URI to an external manifest.
+        Packaged apps: a URI to a mini manifest on m.m.o.
+        """
+        if self.is_packaged:
+            if self.current_version:
+                return absolutify(self.get_detail_url('manifest'))
+            else:
+                # Invalid statuses don't have `current_version`.
+                # TODO: Ask Rob about reviewers being able to install
+                # disabled apps?
+                return ''
+        else:
+            return self.manifest_url
+
     def has_icon_in_manifest(self):
         data = self.get_manifest_json()
         return 'icons' in data
@@ -683,7 +700,7 @@ class Meta:
 def add_uuid(sender, **kw):
     if not kw.get('raw'):
         install = kw['instance']
-        if not install.uuid and install.premium_type == None:
+        if not install.uuid and install.premium_type is None:
             install.uuid = ('%s-%s' % (install.pk, str(uuid.uuid4())))
             install.premium_type = install.addon.premium_type
             install.save()