pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web: kanban: attribute default_order

Browse Source 
Before this commit the attribute default_order was not taken into
consideration by the kanban view.

closes odoo/odoo#103127

X-original-commit: 0116b590a47c8c12354877498e576ad28e42c1f2
Signed-off-by: Bruno Boi (boi) <boi@odoo.com>
This commit is contained in:
Mathieu Duckerts-Antoine
2022-10-12 10:34:50 +02:00
parent 7fff7ff584
commit df6c716bc2
2 changed files with 47 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/views/kanban/kanban_controller.js
+1
View File
@@ -28,6 +28,7 @@ export class KanbanController extends Component {
onCreate: archInfo.onCreate,
quickCreateView: archInfo.quickCreateView,
defaultGroupBy,
defaultOrder: archInfo.defaultOrder,
viewMode: "kanban",
openGroupsByDefault: true,
tooltipInfo: archInfo.tooltipInfo,
addons/web/static/tests/views/kanban_view_tests.js
+46 -13
View File
@@ -9710,18 +9710,18 @@ QUnit.module("Views", (hooks) => {
if (route === "/web/dataset/resequence") {
assert.deepEqual(
args.ids,
[2, 3, 4, 1],
[2, 1, 3, 4],
"should write the sequence in correct order"
);
}
},
});
assert.deepEqual(getCardTexts(), ["yop", "blip", "gnap", "blip"]);
assert.deepEqual(getCardTexts(), ["blip", "blip", "yop", "gnap"]);
await dragAndDrop(".o_kanban_record", ".o_kanban_record:nth-child(4)");
assert.deepEqual(getCardTexts(), ["blip", "gnap", "blip", "yop"]);
assert.deepEqual(getCardTexts(), ["blip", "yop", "gnap", "blip"]);
});
QUnit.test("ungrouped kanban without handle field", async (assert) => {
@@ -11414,26 +11414,25 @@ QUnit.module("Views", (hooks) => {
[...target.querySelectorAll(".o_kanban_record:not(.o_kanban_ghost)")].map(
(el) => el.innerText
),
["yop", "blip", "gnap", "blip"]
["blip", "blip", "yop", "gnap"]
);
assert.verifySteps([]);
// move "yop" to second place
await dragAndDrop(".o_kanban_record", ".o_kanban_record:nth-child(2)");
// move second "blip" to third place
await dragAndDrop(".o_kanban_record:nth-child(2)", ".o_kanban_record:nth-child(3)");
assert.deepEqual(
[...target.querySelectorAll(".o_kanban_record:not(.o_kanban_ghost)")].map(
(el) => el.innerText
),
["yop", "blip", "gnap", "blip"]
["blip", "blip", "yop", "gnap"]
);
assert.verifySteps(["resequence"]);
// try again
await dragAndDrop(".o_kanban_record", ".o_kanban_record:nth-child(2)");
assert.verifySteps([]);
await dragAndDrop(".o_kanban_record:nth-child(2)", ".o_kanban_record:nth-child(3)");
-assert.verifySteps([]);
def.resolve();
await nextTick();
@@ -11442,16 +11441,16 @@ QUnit.module("Views", (hooks) => {
[...target.querySelectorAll(".o_kanban_record:not(.o_kanban_ghost)")].map(
(el) => el.innerText
),
["blip", "yop", "gnap", "blip"]
["blip", "yop", "blip", "gnap"]
);
await dragAndDrop(".o_kanban_record:nth-child(2)", ".o_kanban_record:nth-child(3)");
await dragAndDrop(".o_kanban_record:nth-child(3)", ".o_kanban_record:nth-child(4)");
assert.deepEqual(
[...target.querySelectorAll(".o_kanban_record:not(.o_kanban_ghost)")].map(
(el) => el.innerText
),
["blip", "gnap", "yop", "blip"]
["blip", "yop", "gnap", "blip"]
);
assert.verifySteps(["resequence"]);
});
@@ -12162,4 +12161,38 @@ QUnit.module("Views", (hooks) => {
assert.containsNone(target, ".o_kanban_record.o_dragged");
});
QUnit.test("attribute default_order", async function (assert) {
serverData.models.custom_model = {
fields: {
int: { type: "integer", string: "Int" },
},
records: [
{ id: 1, int: 1 },
{ id: 2, int: 3 },
{ id: 3, int: 2 },
],
};
await makeView({
type: "kanban",
resModel: "custom_model",
serverData,
arch: `
<kanban default_order="int">
<templates>
<div t-name="kanban-box">
<field name="int" />
</div>
</templates>
</kanban>
`,
});
assert.deepEqual(
[...target.querySelectorAll(".o_kanban_record:not(.o_kanban_ghost)")].map(
(el) => el.innerText
),
["1", "2", "3"]
);
});
});