3 Commits

2 changed files with 6 additions and 6 deletions

View File

@@ -7,11 +7,11 @@ class MaintenanceEquipment(models.Model):
_sql_constraints = [ _sql_constraints = [
('unique_name', 'UNIQUE(name)', 'Name must be unique.'), ('unique_name', 'UNIQUE(name)', 'Name must be unique.'),
('unique_server_ip', 'UNIQUE(server_ip)', 'Server IP must be unique.'), ('unique_server_ip', 'UNIQUE(server_ip)', 'Server IP must be unique.'),
('unique_main_domain_name', 'UNIQUE(main_domain_name)', 'Main Domain Name must be unique.'), ('unique_ssh_target', 'UNIQUE(ssh_target)', 'Main Domain Name must be unique.'),
] ]
server_ip = fields.Char("Server Ip Address") server_ip = fields.Char("Server Ip Address")
main_domain_name = fields.Char("Main Domain Name", ) ssh_target = fields.Char("SSH Target", )
distribution_id = fields.Many2one("os.distribution", string="Distribution") distribution_id = fields.Many2one("os.distribution", string="Distribution")
service_ids = fields.One2many("service.instance", "equipment_id", string="Services") service_ids = fields.One2many("service.instance", "equipment_id", string="Services")
hosting_city = fields.Char("Hosting City") hosting_city = fields.Char("Hosting City")
@@ -28,8 +28,8 @@ class MaintenanceEquipment(models.Model):
default = dict(default or {}) default = dict(default or {})
if "server_ip" not in default: if "server_ip" not in default:
default["server_ip"] = False default["server_ip"] = False
if "main_domain_name" not in default: if "ssh_target" not in default:
default["main_domain_name"] = False default["ssh_target"] = False
vals_list = super().copy_data(default=default) vals_list = super().copy_data(default=default)
if "name" not in default: if "name" not in default:
for equipment, vals in zip(self, vals_list): for equipment, vals in zip(self, vals_list):

View File

@@ -8,7 +8,7 @@
<xpath expr="//field[@name='effective_date']/.." position="after"> <xpath expr="//field[@name='effective_date']/.." position="after">
<group name="server_data" string="Server data"> <group name="server_data" string="Server data">
<field name="server_ip" /> <field name="server_ip" />
<field name="main_domain_name" /> <field name="ssh_target" />
<field name="hosting_city" /> <field name="hosting_city" />
<field name="distribution_id" /> <field name="distribution_id" />
<field name="nb_cores" /> <field name="nb_cores" />
@@ -46,7 +46,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//field[@name='category_id']" position="after"> <xpath expr="//field[@name='category_id']" position="after">
<field name="server_ip" optional="hide" /> <field name="server_ip" optional="hide" />
<field name="main_domain_name" optional="hide" /> <field name="ssh_target" optional="hide" />
<field name="hosting_city" optional="hide" /> <field name="hosting_city" optional="hide" />
<field name="distribution_id" optional="hide" /> <field name="distribution_id" optional="hide" />
<field name="nb_cores" optional="hide" /> <field name="nb_cores" optional="hide" />