Merge pull request #5009 from expsa/ykk_dev_odex25_base
[FIX] system_dashboard_classic: FIX bug delete nodes
This commit is contained in:
commit
68ad2b0d9b
|
|
@ -74,6 +74,7 @@ class BaseDashboard(models.Model):
|
|||
relation = fields.Char(
|
||||
string='action_domain',
|
||||
)
|
||||
search_field = fields.Char(string='Search field', required=True, default='employee_id.user_id')
|
||||
|
||||
def unlink_nodes(self):
|
||||
for rec in self:
|
||||
|
|
|
|||
|
|
@ -345,28 +345,34 @@ class SystemDashboard(models.Model):
|
|||
pass
|
||||
|
||||
# service_action_domain.append('|')
|
||||
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))
|
||||
if model.search_field:
|
||||
service_action_domain.append((model.search_field, '=', user.id))
|
||||
|
||||
if 'employee_id' in mod._fields:
|
||||
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))
|
||||
|
||||
if 'user_id' in mod._fields:
|
||||
service_action_domain.append(('user_id', '=', user.id))
|
||||
#if 'employee_id' in mod._fields:
|
||||
# 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))
|
||||
|
||||
else:
|
||||
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))
|
||||
if model.search_field:
|
||||
service_action_domain.append((model.search_field, '=', user.id))
|
||||
|
||||
#if 'employee_id' in mod._fields and 'user_id' in mod._fields:
|
||||
# service_action_domain.append('|')
|
||||
if 'employee_id' in mod._fields:
|
||||
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(('user_id', '=', user.id))
|
||||
# service_action_domain.append(('employee_id.user_id', '=', user.id))
|
||||
# service_action_domain.append('|')
|
||||
#if 'employee_id' in mod._fields:
|
||||
# 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))
|
||||
# value = self.env['ir.translation'].sudo().search([('source', '=', model.name)], limit=1).value
|
||||
values['cards'].append({
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
<field name="is_self_service"/>
|
||||
<field name="is_financial_impact"/>
|
||||
<field name="sequence"/>
|
||||
<field name="search_field"/>
|
||||
<field name="action_domain" invisible="1" />
|
||||
<field name="action_context" invisible="1"/>
|
||||
<field name="is_button" invisible="1"/>
|
||||
|
|
|
|||
Loading…
Reference in New Issue