forked from Techsystech/web
[MIG] web_dialog_size: Migration to 17.0
Carlos Roca
parent
d760a19735
commit
996d4e56e6
|
|
@ -91,6 +91,7 @@ Contributors
|
|||
- Pedro M. Baeza
|
||||
- Jairo Llopis
|
||||
- Ernesto Tejeda
|
||||
- Carlos Roca
|
||||
|
||||
- Sudhir Arya <sudhir@erpharbor.com>
|
||||
- Pierre Pizzetta <pierre@devreaction.com>
|
||||
|
|
|
|||
|
|
@ -15,19 +15,25 @@
|
|||
"Odoo Community Association (OCA)",
|
||||
"website": "https://github.com/OCA/web",
|
||||
"category": "web",
|
||||
"version": "16.0.1.0.1",
|
||||
"version": "17.0.1.0.0",
|
||||
"license": "AGPL-3",
|
||||
"depends": ["web"],
|
||||
"installable": True,
|
||||
"assets": {
|
||||
"web.assets_backend": [
|
||||
"/web_dialog_size/static/src/js/web_dialog_size.js",
|
||||
"/web_dialog_size/static/src/js/web_dialog_size.esm.js",
|
||||
"/web_dialog_size/static/src/js/web_dialog_draggable.esm.js",
|
||||
"/web_dialog_size/static/src/scss/web_dialog_size.scss",
|
||||
"/web_dialog_size/static/src/xml/web_dialog_size.xml",
|
||||
"/web_dialog_size/static/src/xml/ExpandButton.xml",
|
||||
"/web_dialog_size/static/src/xml/DialogDraggable.xml",
|
||||
(
|
||||
"after",
|
||||
"/web/static/src/core/dialog/dialog.xml",
|
||||
"/web_dialog_size/static/src/xml/web_dialog_header.xml",
|
||||
),
|
||||
(
|
||||
"after",
|
||||
"/web/static/src/views/view_dialogs/select_create_dialog.xml",
|
||||
"/web_dialog_size/static/src/xml/select_create_dialog.xml",
|
||||
),
|
||||
],
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
- Pedro M. Baeza
|
||||
- Jairo Llopis
|
||||
- Ernesto Tejeda
|
||||
- Carlos Roca
|
||||
- Sudhir Arya \<<sudhir@erpharbor.com>\>
|
||||
- Pierre Pizzetta \<<pierre@devreaction.com>\>
|
||||
- Mantas Šniukas \<<mantas@vialaurea.lt>\>
|
||||
|
|
|
|||
|
|
@ -442,6 +442,7 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
|
|||
<li>Pedro M. Baeza</li>
|
||||
<li>Jairo Llopis</li>
|
||||
<li>Ernesto Tejeda</li>
|
||||
<li>Carlos Roca</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>Sudhir Arya <<a class="reference external" href="mailto:sudhir@erpharbor.com">sudhir@erpharbor.com</a>></li>
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
/** @odoo-module **/
|
||||
|
||||
import {ActionDialog} from "@web/webclient/actions/action_dialog";
|
||||
import {onMounted, useExternalListener} from "@odoo/owl";
|
||||
import {useListener} from "@web/core/utils/hooks";
|
||||
import {LegacyComponent} from "@web/legacy/legacy_component";
|
||||
import {Dialog} from "@web/core/dialog/dialog";
|
||||
|
||||
export class DialogDraggable extends LegacyComponent {
|
||||
setup() {
|
||||
this.element_position = {x: 0, y: 0};
|
||||
this.mouse_to_element_ratio = {x: 0, y: 0};
|
||||
const bound_onDrag = this.onDrag.bind(this);
|
||||
useListener("mousedown", "header.modal-header", (event) => {
|
||||
const y = parseInt(this.el.querySelector(".modal-content").offsetTop, 10);
|
||||
const x = parseInt(this.el.querySelector(".modal-content").offsetLeft, 10);
|
||||
this.mouse_to_element_ratio = {x: event.x - x, y: event.y - y};
|
||||
this.element_position = {
|
||||
x: event.x - this.mouse_to_element_ratio.x - x,
|
||||
y: event.y - this.mouse_to_element_ratio.y - y,
|
||||
};
|
||||
document.addEventListener("mousemove", bound_onDrag);
|
||||
});
|
||||
useExternalListener(document, "mouseup", () =>
|
||||
document.removeEventListener("mousemove", bound_onDrag)
|
||||
);
|
||||
onMounted(() => {
|
||||
this.el.querySelector(".modal-content").classList.add("position-absolute");
|
||||
this.el.parentNode.classList.add("position-relative");
|
||||
});
|
||||
}
|
||||
|
||||
getMovePosition({x, y}) {
|
||||
return {
|
||||
x: x - this.mouse_to_element_ratio.x - this.element_position.x,
|
||||
y: y - this.mouse_to_element_ratio.y - this.element_position.y,
|
||||
};
|
||||
}
|
||||
onDrag(event) {
|
||||
const {x, y} = this.getMovePosition(event);
|
||||
const el = this.el.querySelector(".modal-content");
|
||||
el.style.left = `${x}px`;
|
||||
el.style.top = `${y}px`;
|
||||
}
|
||||
}
|
||||
|
||||
DialogDraggable.template = "DialogDraggable";
|
||||
|
||||
Dialog.components = Object.assign(Dialog.components || {}, {DialogDraggable});
|
||||
Object.assign(ActionDialog.components, {DialogDraggable});
|
||||
|
|
@ -1,19 +1,20 @@
|
|||
/** @odoo-module **/
|
||||
|
||||
import {ActionDialog} from "@web/webclient/actions/action_dialog";
|
||||
import {patch} from "@web/core/utils/patch";
|
||||
import rpc from "web.rpc";
|
||||
import {Component, onMounted} from "@odoo/owl";
|
||||
import {Dialog} from "@web/core/dialog/dialog";
|
||||
import {SelectCreateDialog} from "@web/views/view_dialogs/select_create_dialog";
|
||||
import {patch} from "@web/core/utils/patch";
|
||||
import {useService} from "@web/core/utils/hooks";
|
||||
|
||||
export class ExpandButton extends Component {
|
||||
setup() {
|
||||
this.orm = useService("orm");
|
||||
this.last_size = this.props.getsize();
|
||||
this.config = rpc.query({
|
||||
model: "ir.config_parameter",
|
||||
method: "get_web_dialog_size_config",
|
||||
});
|
||||
this.config = this.orm.call(
|
||||
"ir.config_parameter",
|
||||
"get_web_dialog_size_config"
|
||||
);
|
||||
|
||||
onMounted(() => {
|
||||
var self = this;
|
||||
|
|
@ -38,9 +39,9 @@ export class ExpandButton extends Component {
|
|||
|
||||
ExpandButton.template = "web_dialog_size.ExpandButton";
|
||||
|
||||
patch(Dialog.prototype, "web_dialog_size.Dialog", {
|
||||
patch(Dialog.prototype, {
|
||||
setup() {
|
||||
this._super(...arguments);
|
||||
super.setup();
|
||||
this.setSize = this.setSize.bind(this);
|
||||
this.getSize = this.getSize.bind(this);
|
||||
},
|
||||
|
|
@ -55,9 +56,9 @@ patch(Dialog.prototype, "web_dialog_size.Dialog", {
|
|||
},
|
||||
});
|
||||
|
||||
patch(SelectCreateDialog.prototype, "web_dialog_size.SelectCreateDialog", {
|
||||
patch(SelectCreateDialog.prototype, {
|
||||
setup() {
|
||||
this._super(...arguments);
|
||||
super.setup();
|
||||
this.setSize = this.setSize.bind(this);
|
||||
this.getSize = this.getSize.bind(this);
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
odoo.define("web_dialog_size.web_dialog_size", function (require) {
|
||||
"use strict";
|
||||
|
||||
var rpc = require("web.rpc");
|
||||
var Dialog = require("web.Dialog");
|
||||
|
||||
var config = rpc.query({
|
||||
model: "ir.config_parameter",
|
||||
method: "get_web_dialog_size_config",
|
||||
});
|
||||
|
||||
Dialog.include({
|
||||
willStart: function () {
|
||||
var self = this;
|
||||
return this._super.apply(this, arguments).then(function () {
|
||||
self.$modal
|
||||
.find(".dialog_button_extend")
|
||||
.on("click", self.proxy("_extending"));
|
||||
self.$modal
|
||||
.find(".dialog_button_restore")
|
||||
.on("click", self.proxy("_restore"));
|
||||
self.$modal.find(">:first-child").draggable({
|
||||
handle: ".modal-header",
|
||||
helper: false,
|
||||
});
|
||||
return config.then(function (r) {
|
||||
if (r.default_maximize) {
|
||||
self._extending();
|
||||
} else {
|
||||
self._restore();
|
||||
}
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
_extending: function () {
|
||||
var dialog = this.$modal.find(".modal-dialog");
|
||||
dialog.addClass("modal-dialog_full_screen");
|
||||
dialog.find(".dialog_button_extend").hide();
|
||||
dialog.find(".dialog_button_restore").show();
|
||||
},
|
||||
|
||||
_restore: function () {
|
||||
var dialog = this.$modal.find(".modal-dialog");
|
||||
dialog.removeClass("modal-dialog_full_screen");
|
||||
dialog.find(".dialog_button_restore").hide();
|
||||
dialog.find(".dialog_button_extend").show();
|
||||
},
|
||||
});
|
||||
});
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<templates>
|
||||
<t t-name="DialogDraggable" owl="1">
|
||||
<div>
|
||||
<t t-slot="default" />
|
||||
</div>
|
||||
</t>
|
||||
</templates>
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<templates xml:space="preserve">
|
||||
<t t-inherit="web.SelectCreateDialog" t-inherit-mode="extension" owl="1">
|
||||
<xpath expr="//Dialog" position="attributes">
|
||||
<attribute name="size">props.size</attribute>
|
||||
</xpath>
|
||||
</t>
|
||||
</templates>
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<templates xml:space="preserve">
|
||||
|
||||
<t t-inherit="web.Dialog.header" t-inherit-mode="extension" owl="1">
|
||||
<xpath expr="//button[hasclass('btn-close')]" position="before">
|
||||
<ExpandButton
|
||||
getsize="getSize"
|
||||
setsize="setSize"
|
||||
t-if="!isFullscreen and getSize and setSize"
|
||||
/>
|
||||
</xpath>
|
||||
</t>
|
||||
</templates>
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<templates xml:space="preserve">
|
||||
<!-- This is for old Dialog template.
|
||||
Because Odoo haven't done every template to OWL. -->
|
||||
<t t-extend="web.DialogWidget">
|
||||
<t t-jquery="button.btn-close" t-operation="before">
|
||||
<button type="button" class="dialog_button_extend btn btn-secondary">
|
||||
<i class="fa fa-expand" />
|
||||
</button>
|
||||
<button type="button" class="dialog_button_restore btn btn-secondary">
|
||||
<i class="fa fa-compress" />
|
||||
</button>
|
||||
</t>
|
||||
</t>
|
||||
|
||||
<t t-inherit="web.LegacyAdaptedActionDialog" t-inherit-mode="extension" owl="1">
|
||||
<xpath expr="//div[hasclass('modal-content')]" position="before">
|
||||
<DialogDraggable />
|
||||
</xpath>
|
||||
<DialogDraggable position="inside">
|
||||
<xpath expr="//div[hasclass('modal-content')]" position="move" />
|
||||
</DialogDraggable>
|
||||
</t>
|
||||
|
||||
<t t-inherit="web.Dialog" t-inherit-mode="extension" owl="1">
|
||||
<xpath expr="//div[hasclass('modal-content')]" position="before">
|
||||
<DialogDraggable />
|
||||
</xpath>
|
||||
<DialogDraggable position="inside">
|
||||
<xpath expr="//div[hasclass('modal-content')]" position="move" />
|
||||
</DialogDraggable>
|
||||
</t>
|
||||
|
||||
<t t-inherit="web.ActionDialog" t-inherit-mode="extension" owl="1">
|
||||
<xpath expr="//div[hasclass('modal-content')]" position="before">
|
||||
<DialogDraggable />
|
||||
</xpath>
|
||||
<DialogDraggable position="inside">
|
||||
<xpath expr="//div[hasclass('modal-content')]" position="move" />
|
||||
</DialogDraggable>
|
||||
</t>
|
||||
|
||||
<t t-inherit="web.ActionDialog.header" t-inherit-mode="extension" owl="1">
|
||||
<xpath expr="//button[hasclass('btn-close')]" position="before">
|
||||
<ExpandButton getsize="getSize" setsize="setSize" t-if="!isFullscreen" />
|
||||
</xpath>
|
||||
</t>
|
||||
|
||||
<t t-inherit="web.Dialog.header" t-inherit-mode="extension" owl="1">
|
||||
<xpath expr="//button[hasclass('btn-close')]" position="before">
|
||||
<ExpandButton
|
||||
getsize="getSize"
|
||||
setsize="setSize"
|
||||
t-if="!isFullscreen and getSize and setSize"
|
||||
/>
|
||||
</xpath>
|
||||
</t>
|
||||
|
||||
<t t-inherit="web.SelectCreateDialog" t-inherit-mode="extension" owl="1">
|
||||
<xpath expr="//Dialog" position="attributes">
|
||||
<attribute name="size">props.size</attribute>
|
||||
</xpath>
|
||||
</t>
|
||||
|
||||
</templates>
|
||||
|
|
@ -6,7 +6,7 @@ from odoo.tests.common import TransactionCase
|
|||
|
||||
class TestWebDialogSize(TransactionCase):
|
||||
def setUp(self):
|
||||
super(TestWebDialogSize, self).setUp()
|
||||
super().setUp()
|
||||
|
||||
def test_get_web_dialog_size_config(self):
|
||||
obj = self.env["ir.config_parameter"]
|
||||
|
|
|
|||
Loading…
Reference in New Issue