From 509917ca05ec12d6486b6dea648977bff4ddc7fb Mon Sep 17 00:00:00 2001 From: Oliver Yuan Date: Mon, 17 Apr 2023 10:35:25 +0800 Subject: [PATCH] [IMP] Improve ospp_base and ospp_slide modules --- addons/ospp_slide/models/models.py | 8 ++++---- addons/ospp_slide/views/views.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/ospp_slide/models/models.py b/addons/ospp_slide/models/models.py index 37b5a97..9bfcdf8 100644 --- a/addons/ospp_slide/models/models.py +++ b/addons/ospp_slide/models/models.py @@ -36,7 +36,7 @@ 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}" + service_name = f"{rec.code}{i}" val = { "name": service_name, "channel_id": rec.id, @@ -55,7 +55,7 @@ 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}" + service_name = f"{rec.code}{partner_id.partner_id.code}" val = { "name": service_name, "channel_id": rec.id, @@ -74,7 +74,7 @@ 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}" + service_name = f"{rec.code}{i}" instance_id = instance_obj.search([('name', '=', service_name), ('channel_id', '=', rec.id)]) if not instance_id: val = { @@ -96,7 +96,7 @@ 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}" + service_name = f"{rec.code}{partner_id.partner_id.code}" instance_id = instance_obj.search([('name', '=', service_name), ('channel_id', '=', rec.id)]) if not instance_id: val = { diff --git a/addons/ospp_slide/views/views.xml b/addons/ospp_slide/views/views.xml index e1d0169..e49db5c 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'])]}"/> - +