diff --git a/addons/ospp_slide/models/models.py b/addons/ospp_slide/models/models.py index 987d3b6..37b5a97 100644 --- a/addons/ospp_slide/models/models.py +++ b/addons/ospp_slide/models/models.py @@ -36,12 +36,13 @@ class SlideChannel(models.Model): if rec.instance_arrangement in ['share', 'both']: vals = [] for i in range(rec.shared_instance_count): + service_name = f"{rec.code}-{i}" val = { - "name": f"share-{i}", + "name": service_name, "channel_id": rec.id, "instance_id": rec.instance_base and rec.instance_base.id, - "service_name": f"{rec.code}", - "service_url": f"{rec.instance_base.service_scheme}://{rec.code}-{i}.{rec.instance_base.service_base_host}", + "service_name": service_name, + "service_url": f"{rec.instance_base.service_scheme}://{service_name}.{rec.instance_base.service_base_host}", "admin_account": f"{rec.user_id.email}", "admin_password": f"{random.randint(10000000,99999999)}", "user_scope": [(6, 0, partner_ids.ids)], @@ -54,12 +55,13 @@ class SlideChannel(models.Model): if rec.instance_arrangement in ['exclude', 'both']: vals = [] for partner_id in partner_ids: + service_name = f"{rec.code}-{partner_id.partner_id.code}" val = { - "name": f"{partner_id.partner_id.code}", + "name": service_name, "channel_id": rec.id, "instance_id": rec.instance_base and rec.instance_base.id, - "service_name": f"{rec.code}-{partner_id.partner_id.code}", - "service_url": f"{rec.instance_base.service_scheme}://{rec.code}-{partner_id.partner_id.code}.{rec.instance_base.service_base_host}", + "service_name": service_name, + "service_url": f"{rec.instance_base.service_scheme}://{service_name}.{rec.instance_base.service_base_host}", "admin_account": f"{partner_id.partner_email}", "admin_password": f"{random.randint(10000000,99999999)}", "user_scope": [(6, 0, partner_id.ids)], diff --git a/addons/ospp_slide/views/views.xml b/addons/ospp_slide/views/views.xml index 236cf15..2928abb 100644 --- a/addons/ospp_slide/views/views.xml +++ b/addons/ospp_slide/views/views.xml @@ -22,7 +22,7 @@ attrs="{'invisible': [('instance_arrangement', 'in', ['no_need'])]}"/> - +