devops_admin
/
odex25_standard
mirror of https://github.com/hydracp9/odex25_standard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5009 from expsa/ykk_dev_odex25_base 

[FIX] system_dashboard_classic: FIX bug delete nodes
This commit is contained in:
kchyounes19 2025-10-21 12:14:22 +01:00 committed by GitHub
parent fa35a3309e e6307a2231
commit 68ad2b0d9b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
odex25_base/system_dashboard_classic/models/config.py
View File

@ -74,6 +74,7 @@ class BaseDashboard(models.Model):
relation = fields.Char( relation = fields.Char(
string='action_domain', string='action_domain',
) )
search_field = fields.Char(string='Search field', required=True, default='employee_id.user_id')
def unlink_nodes(self): def unlink_nodes(self):
for rec in self: for rec in self:

38
odex25_base/system_dashboard_classic/models/models.py
View File

@ -345,28 +345,34 @@ class SystemDashboard(models.Model):
pass pass
# service_action_domain.append('|') # service_action_domain.append('|')
if 'employee_id' in mod._fields and 'user_id' in mod._fields: if model.search_field:
service_action_domain.append('|') service_action_domain.append((model.search_field, '=', user.id))
service_action_domain.append(('user_id', '=', user.id))
service_action_domain.append(('employee_id.user_id', '=', user.id))
if 'employee_id' in mod._fields: #if 'employee_id' in mod._fields and 'user_id' in mod._fields:
service_action_domain.append(('employee_id.user_id', '=', user.id)) # service_action_domain.append('|')
# service_action_domain.append(('user_id', '=', user.id))
# service_action_domain.append(('employee_id.user_id', '=', user.id))
if 'user_id' in mod._fields: #if 'employee_id' in mod._fields:
service_action_domain.append(('user_id', '=', user.id)) # service_action_domain.append(('employee_id.user_id', '=', user.id))
#if 'user_id' in mod._fields:
# service_action_domain.append(('user_id', '=', user.id))
# service_action_domain.append(('employee_id.user_id','=',user.id)) # service_action_domain.append(('employee_id.user_id','=',user.id))
else: else:
if 'employee_id' in mod._fields and 'user_id' in mod._fields: if model.search_field:
service_action_domain.append('|') service_action_domain.append((model.search_field, '=', user.id))
service_action_domain.append(('user_id', '=', user.id))
service_action_domain.append(('employee_id.user_id', '=', user.id)) #if 'employee_id' in mod._fields and 'user_id' in mod._fields:
# service_action_domain.append('|')
# service_action_domain.append(('user_id', '=', user.id))
# service_action_domain.append(('employee_id.user_id', '=', user.id))
# service_action_domain.append('|') # service_action_domain.append('|')
if 'employee_id' in mod._fields: #if 'employee_id' in mod._fields:
service_action_domain.append(('employee_id.user_id', '=', user.id)) # service_action_domain.append(('employee_id.user_id', '=', user.id))
if 'user_id' in mod._fields: #if 'user_id' in mod._fields:
service_action_domain.append(('user_id', '=', user.id)) # service_action_domain.append(('user_id', '=', user.id))
# service_action_domain.append(('employee_id.user_id','=',user.id)) # service_action_domain.append(('employee_id.user_id','=',user.id))
# value = self.env['ir.translation'].sudo().search([('source', '=', model.name)], limit=1).value # value = self.env['ir.translation'].sudo().search([('source', '=', model.name)], limit=1).value
values['cards'].append({ values['cards'].append({

1
odex25_base/system_dashboard_classic/views/config.xml
View File

@ -18,6 +18,7 @@
<field name="is_self_service"/> <field name="is_self_service"/>
<field name="is_financial_impact"/> <field name="is_financial_impact"/>
<field name="sequence"/> <field name="sequence"/>
<field name="search_field"/>
<field name="action_domain" invisible="1" /> <field name="action_domain" invisible="1" />
<field name="action_context" invisible="1"/> <field name="action_context" invisible="1"/>
<field name="is_button" invisible="1"/> <field name="is_button" invisible="1"/>