fa401f82-6782-4b29-a2b6-25baec60fc14
/
OSPPCloudEnterprise3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[IMP] Improve ospp_base and ospp_slide modules

enterprise-opentkr-16.0
Oliver Yuan 2023-04-17 10:35:25 +08:00
parent 8d3142a5b4
commit 509917ca05
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/ospp_slide/models/models.py
View File

@ -36,7 +36,7 @@ class SlideChannel(models.Model):
if rec.instance_arrangement in ['share', 'both']: if rec.instance_arrangement in ['share', 'both']:
vals = [] vals = []
for i in range(rec.shared_instance_count): for i in range(rec.shared_instance_count):
service_name = f"{rec.code}-{i}" service_name = f"{rec.code}{i}"
val = { val = {
"name": service_name, "name": service_name,
"channel_id": rec.id, "channel_id": rec.id,
@ -55,7 +55,7 @@ class SlideChannel(models.Model):
if rec.instance_arrangement in ['exclude', 'both']: if rec.instance_arrangement in ['exclude', 'both']:
vals = [] vals = []
for partner_id in partner_ids: 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 = { val = {
"name": service_name, "name": service_name,
"channel_id": rec.id, "channel_id": rec.id,
@ -74,7 +74,7 @@ class SlideChannel(models.Model):
if rec.instance_arrangement in ['share', 'both']: if rec.instance_arrangement in ['share', 'both']:
vals = [] vals = []
for i in range(rec.shared_instance_count): 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)]) instance_id = instance_obj.search([('name', '=', service_name), ('channel_id', '=', rec.id)])
if not instance_id: if not instance_id:
val = { val = {
@ -96,7 +96,7 @@ class SlideChannel(models.Model):
if rec.instance_arrangement in ['exclude', 'both']: if rec.instance_arrangement in ['exclude', 'both']:
vals = [] vals = []
for partner_id in partner_ids: 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)]) instance_id = instance_obj.search([('name', '=', service_name), ('channel_id', '=', rec.id)])
if not instance_id: if not instance_id:
val = { val = {

2
addons/ospp_slide/views/views.xml
View File

@ -22,7 +22,7 @@
attrs="{'invisible': [('instance_arrangement', 'in', ['no_need'])]}"/> attrs="{'invisible': [('instance_arrangement', 'in', ['no_need'])]}"/>
</group> </group>
</group> </group>
<field name="instance_ids" mode="tree,form" readonly="1" attrs="{'invisible': [('instance_arrangement', 'in', ['no_need'])]}"> <field name="instance_ids" mode="tree,form" readonly="0" attrs="{'invisible': [('instance_arrangement', 'in', ['no_need'])]}">
<tree> <tree>
<field name="sequence" widget="handle"/> <field name="sequence" widget="handle"/>
<field name="code"/> <field name="code"/>