Compare commits
4 Commits
a8c6d24524
...
16.0
| Author | SHA1 | Date | |
|---|---|---|---|
| 30a19649d2 | |||
|
|
51d3d42491 | ||
|
|
00a97e876c | ||
|
|
5b0f220834 |
@@ -2,8 +2,6 @@ name: pre-commit
|
||||
|
||||
on:
|
||||
pull_request:
|
||||
branches:
|
||||
- "16.0*"
|
||||
|
||||
jobs:
|
||||
pre-commit:
|
||||
@@ -15,10 +13,10 @@ jobs:
|
||||
python-version: "3.11"
|
||||
- name: Get python version
|
||||
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
|
||||
# - uses: actions/cache@v4
|
||||
# with:
|
||||
# path: ~/.cache/pre-commit
|
||||
# key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
|
||||
- uses: https://gitea.com/actions/cache@v3
|
||||
with:
|
||||
path: ~/.cache/pre-commit
|
||||
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
|
||||
- name: Install pre-commit
|
||||
run: pip install pre-commit
|
||||
- name: Run pre-commit
|
||||
|
||||
@@ -21,3 +21,11 @@ class MaintenanceEquipment(models.Model):
|
||||
def _compute_name_fr(self):
|
||||
for record in self:
|
||||
record.name_fr = record.with_context(lang="fr_FR").name
|
||||
|
||||
def write(self, vals):
|
||||
res = super().write(vals)
|
||||
if "active" in vals:
|
||||
self.with_context(active_test=False).service_ids.write(
|
||||
{"active": vals["active"]}
|
||||
)
|
||||
return res
|
||||
|
||||
@@ -19,6 +19,7 @@ class ServiceInstance(models.Model):
|
||||
service_id = fields.Many2one('service', string='Service', required=True)
|
||||
version_id = fields.Many2one('service.version', string='Version')
|
||||
service_url = fields.Char(string='Service Url')
|
||||
active = fields.Boolean(default=True)
|
||||
|
||||
|
||||
class BackupServer(models.Model):
|
||||
|
||||
@@ -45,6 +45,27 @@
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<record id="service_instance_view_search" model="ir.ui.view">
|
||||
<field name="name">service.instance.view.search</field>
|
||||
<field name="model">service.instance</field>
|
||||
<field name="arch" type="xml">
|
||||
<search string="Search Service Instances">
|
||||
<field name="equipment_id"/>
|
||||
<field name="service_id"/>
|
||||
<field name="version_id"/>
|
||||
<field name="service_url"/>
|
||||
<separator/>
|
||||
<filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
|
||||
<separator/>
|
||||
<group expand="0" string="Group By">
|
||||
<filter string="Equipment" name="group_equipment" context="{'group_by': 'equipment_id'}"/>
|
||||
<filter string="Service" name="group_service" context="{'group_by': 'service_id'}"/>
|
||||
<filter string="Version" name="group_version" context="{'group_by': 'version_id'}"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- ACTIONS -->
|
||||
<record id="service_action" model="ir.actions.act_window">
|
||||
<field name="name">Service</field>
|
||||
@@ -121,6 +142,6 @@
|
||||
name="Services"
|
||||
parent="maintenance.menu_maintenance_title"
|
||||
action="service_instance_action"
|
||||
sequence="35"/>
|
||||
sequence="10"/>
|
||||
|
||||
</odoo>
|
||||
@@ -60,7 +60,7 @@ class ServiceInstance(models.Model):
|
||||
|
||||
@api.model
|
||||
def cron_check_http_services(self):
|
||||
domain = [('service_url', '!=', False), ('equipment_id', '!=', False)]
|
||||
domain = [('active', '=', True), ('service_url', '!=', False), ('equipment_id', '!=', False)]
|
||||
services = self.search(domain)
|
||||
for service in services:
|
||||
equipment = service.equipment_id
|
||||
|
||||
@@ -17,4 +17,24 @@
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- Inherit from base search view to add HTTP monitoring filters -->
|
||||
<record id="service_instance_http_monitoring_search" model="ir.ui.view">
|
||||
<field name="name">service.instance.http.monitoring.search</field>
|
||||
<field name="model">service.instance</field>
|
||||
<field name="inherit_id" ref="maintenance_server_data.service_instance_view_search"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="service_url" position="after">
|
||||
<field name="last_http_status_code" string="Status Code"/>
|
||||
</field>
|
||||
<filter name="inactive" position="before">
|
||||
<filter string="Status OK" name="status_ok" domain="[('http_status_ok', '=', True)]"/>
|
||||
<filter string="Status Error" name="status_error" domain="[('http_status_ok', '=', False)]"/>
|
||||
<separator/>
|
||||
</filter>
|
||||
<filter name="group_version" position="after">
|
||||
<filter string="Status Code" name="group_status_code" context="{'group_by': 'last_http_status_code'}"/>
|
||||
</filter>
|
||||
</field>
|
||||
</record>
|
||||
</odoo>
|
||||
|
||||
Reference in New Issue
Block a user