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 09:58:11 +08:00
parent a7300106af
commit 2ab69cfeef
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,12 +36,13 @@ 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}"
val = { val = {
"name": f"share-{i}", "name": service_name,
"channel_id": rec.id, "channel_id": rec.id,
"instance_id": rec.instance_base and rec.instance_base.id, "instance_id": rec.instance_base and rec.instance_base.id,
"service_name": f"{rec.code}", "service_name": service_name,
"service_url": f"{rec.instance_base.service_scheme}://{rec.code}-{i}.{rec.instance_base.service_base_host}", "service_url": f"{rec.instance_base.service_scheme}://{service_name}.{rec.instance_base.service_base_host}",
"admin_account": f"{rec.user_id.email}", "admin_account": f"{rec.user_id.email}",
"admin_password": f"{random.randint(10000000,99999999)}", "admin_password": f"{random.randint(10000000,99999999)}",
"user_scope": [(6, 0, partner_ids.ids)], "user_scope": [(6, 0, partner_ids.ids)],
@ -54,12 +55,13 @@ 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}"
val = { val = {
"name": f"{partner_id.partner_id.code}", "name": service_name,
"channel_id": rec.id, "channel_id": rec.id,
"instance_id": rec.instance_base and rec.instance_base.id, "instance_id": rec.instance_base and rec.instance_base.id,
"service_name": f"{rec.code}-{partner_id.partner_id.code}", "service_name": service_name,
"service_url": f"{rec.instance_base.service_scheme}://{rec.code}-{partner_id.partner_id.code}.{rec.instance_base.service_base_host}", "service_url": f"{rec.instance_base.service_scheme}://{service_name}.{rec.instance_base.service_base_host}",
"admin_account": f"{partner_id.partner_email}", "admin_account": f"{partner_id.partner_email}",
"admin_password": f"{random.randint(10000000,99999999)}", "admin_password": f"{random.randint(10000000,99999999)}",
"user_scope": [(6, 0, partner_id.ids)], "user_scope": [(6, 0, partner_id.ids)],

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"/>