mirror of https://github.com/OCA/web.git
commit
ca2e322c52
|
@ -6,6 +6,7 @@
|
||||||
"version": "14.0.1.0.0",
|
"version": "14.0.1.0.0",
|
||||||
"depends": ["web"],
|
"depends": ["web"],
|
||||||
"author": "Smile, Odoo Community Association (OCA)",
|
"author": "Smile, Odoo Community Association (OCA)",
|
||||||
|
"maintainers": ["ilyasProgrammer"],
|
||||||
"license": "AGPL-3",
|
"license": "AGPL-3",
|
||||||
"website": "https://github.com/OCA/web",
|
"website": "https://github.com/OCA/web",
|
||||||
"category": "Tools",
|
"category": "Tools",
|
||||||
|
|
|
@ -6,10 +6,9 @@ from odoo import models
|
||||||
class BaseModel(models.AbstractModel):
|
class BaseModel(models.AbstractModel):
|
||||||
_inherit = "base"
|
_inherit = "base"
|
||||||
|
|
||||||
def get_message_informations(self, values=False):
|
def get_popup_message_info(self, values=False):
|
||||||
"""
|
"""
|
||||||
This function gives us the possibility to know
|
Retrieve popup messages' data.
|
||||||
if we display the message or not
|
|
||||||
- In create self is empty
|
- In create self is empty
|
||||||
- In write self is not empty contains current ID
|
- In write self is not empty contains current ID
|
||||||
:param values:
|
:param values:
|
||||||
|
@ -22,7 +21,7 @@ class BaseModel(models.AbstractModel):
|
||||||
"""
|
"""
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def execute_processing(self, values=False):
|
def process_popup_message(self, values=False):
|
||||||
"""
|
"""
|
||||||
This function gives us the possibility to execute a
|
This function gives us the possibility to execute a
|
||||||
specific treatment after the confirmation of the message
|
specific treatment after the confirmation of the message
|
||||||
|
|
|
@ -20,8 +20,8 @@ class PopupMessage(models.Model):
|
||||||
default="confirm",
|
default="confirm",
|
||||||
selection=[("confirm", "Confirmation"), ("alert", "Alert")],
|
selection=[("confirm", "Confirmation"), ("alert", "Alert")],
|
||||||
)
|
)
|
||||||
title = fields.Char(string="Title")
|
title = fields.Char(string="Title", translate=True)
|
||||||
message = fields.Text(string="Message", required=True)
|
message = fields.Text(string="Message", required=True, translate=True)
|
||||||
active = fields.Boolean(string="Active", default=True)
|
active = fields.Boolean(string="Active", default=True)
|
||||||
|
|
||||||
@api.depends("field_ids")
|
@api.depends("field_ids")
|
||||||
|
|
|
@ -9,7 +9,7 @@ Confirm res.partner change:
|
||||||
|
|
||||||
msg = self.env['popup.message'].create(
|
msg = self.env['popup.message'].create(
|
||||||
{
|
{
|
||||||
'model_id': self.env['ir.model'].search([('model', '=', 'res.partner')]).id,
|
'model_id': self.env['ir.model']._get_id('res.partner')
|
||||||
'field_ids': [(6, 0, self.env['ir.model.fields'].search([('model', '=', 'res.partner')]).ids)],
|
'field_ids': [(6, 0, self.env['ir.model.fields'].search([('model', '=', 'res.partner')]).ids)],
|
||||||
'popup_type': 'confirm',
|
'popup_type': 'confirm',
|
||||||
'title': 'Warning',
|
'title': 'Warning',
|
||||||
|
@ -24,7 +24,7 @@ Sale order alert:
|
||||||
|
|
||||||
msg = self.env['popup.message'].create(
|
msg = self.env['popup.message'].create(
|
||||||
{
|
{
|
||||||
'model_id': self.env['ir.model'].search([('model', '=', 'sale.order')]).id,
|
'model_id': self.env['ir.model']._get_id('sale.order'),
|
||||||
'field_ids': [(6, 0, self.env['ir.model.fields'].search([('model', '=', 'sale.order')]).ids)],
|
'field_ids': [(6, 0, self.env['ir.model.fields'].search([('model', '=', 'sale.order')]).ids)],
|
||||||
'popup_type': 'alert',
|
'popup_type': 'alert',
|
||||||
'title': 'Attention',
|
'title': 'Attention',
|
||||||
|
|
|
@ -22,11 +22,11 @@ odoo.define("web_create_write_confirm.pop_up_confirmation", function (require) {
|
||||||
var changes = self.model.localData[self.handle]._changes;
|
var changes = self.model.localData[self.handle]._changes;
|
||||||
self.getMessageInformation(
|
self.getMessageInformation(
|
||||||
modelName,
|
modelName,
|
||||||
"get_message_informations",
|
"get_popup_message_info",
|
||||||
record_id,
|
record_id,
|
||||||
changes === null ? {} : changes
|
changes === null ? {} : changes
|
||||||
).then(function (results) {
|
).then(function (results) {
|
||||||
this.display_popup(results, record, record_id, ev, changes, modelName);
|
self.display_popup(results, record, record_id, ev, changes, modelName);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -76,11 +76,11 @@ odoo.define("web_create_write_confirm.pop_up_confirmation", function (require) {
|
||||||
} else if (popup_values.length === index) {
|
} else if (popup_values.length === index) {
|
||||||
self.getMessageInformation(
|
self.getMessageInformation(
|
||||||
modelName,
|
modelName,
|
||||||
"execute_processing",
|
"process_popup_message",
|
||||||
record_id,
|
record_id,
|
||||||
datas
|
datas
|
||||||
);
|
);
|
||||||
this.save(ev);
|
this.save();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
}).on("closed", null, resolve);
|
}).on("closed", null, resolve);
|
||||||
|
@ -90,14 +90,13 @@ odoo.define("web_create_write_confirm.pop_up_confirmation", function (require) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this.save(ev);
|
self.save();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
save: function ev() {
|
save: function ev() {
|
||||||
var self = this;
|
var self = this;
|
||||||
ev.stopPropagation();
|
|
||||||
self._disableButtons();
|
self._disableButtons();
|
||||||
self.saveRecord()
|
self.saveRecord()
|
||||||
.then(self._enableButtons.bind(self))
|
.then(self._enableButtons.bind(self))
|
||||||
|
|
|
@ -36,7 +36,7 @@ class TestBaseModel(SavepointCase):
|
||||||
|
|
||||||
def test_get_message_informations(self):
|
def test_get_message_informations(self):
|
||||||
"""Test correct flow of get_message_informations method"""
|
"""Test correct flow of get_message_informations method"""
|
||||||
ret_value_of_method = self.base_model.get_message_informations()
|
ret_value_of_method = self.base_model.get_popup_message_info()
|
||||||
check_ret_value = False
|
check_ret_value = False
|
||||||
if (ret_value_of_method is False) or isinstance(
|
if (ret_value_of_method is False) or isinstance(
|
||||||
ret_value_of_method, type(self.env["popup.message"])
|
ret_value_of_method, type(self.env["popup.message"])
|
||||||
|
@ -51,5 +51,5 @@ class TestBaseModel(SavepointCase):
|
||||||
def test_execute_processing(self):
|
def test_execute_processing(self):
|
||||||
"""Test correct flow of execute_processing method"""
|
"""Test correct flow of execute_processing method"""
|
||||||
self.assertFalse(
|
self.assertFalse(
|
||||||
self.base_model.execute_processing(), msg="Return value must be False"
|
self.base_model.process_popup_message(), msg="Return value must be False"
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue