diff --git a/saas_apps/controllers/main.py b/saas_apps/controllers/main.py index f7e88e989..03f47edf6 100644 --- a/saas_apps/controllers/main.py +++ b/saas_apps/controllers/main.py @@ -30,7 +30,7 @@ def catch_app_click(self, **kw): @route(['/what_dependencies'], type='json', auth='public') def search_incoming_app_dependencies(self, **kw): - app_tech_name = kw.get('root')[0] + app_tech_name = kw.get('root') app = request.env['saas.line'].sudo().search([('name', '=', app_tech_name)]) return { 'dependencies': app.dependencies_info('root') @@ -94,8 +94,10 @@ def take_product_ids(self, **kw): apps_product_ids = [] apps = modules.search([('name', 'in', module_names), ('application', '=', True)]) templates = request.env['saas.template'].sudo().search([('name', 'in', module_names)]) - for app in apps.product_id + templates.product_id: - apps_product_ids.append(app.id) + for app in apps: + apps_product_ids.append(app.product_id.id) + for package in templates: + apps_product_ids.append(package.product_id.id) return { 'ids': apps_product_ids diff --git a/saas_apps/data/saas_apps_product_user.xml b/saas_apps/data/saas_apps_product_user.xml index 25284813e..fca5bf296 100644 --- a/saas_apps/data/saas_apps_product_user.xml +++ b/saas_apps/data/saas_apps_product_user.xml @@ -4,6 +4,6 @@ User 10 - + diff --git a/saas_apps/data/saas_base_template.xml b/saas_apps/data/saas_base_template.xml index d19752e22..b5e002663 100644 --- a/saas_apps/data/saas_base_template.xml +++ b/saas_apps/data/saas_base_template.xml @@ -15,10 +15,9 @@ - Application base icon - base.png - binary + base.png + True