Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

17.0 mig project task subtask #3

Closed

Conversation

Medeeet
Copy link

@Medeeet Medeeet commented Oct 1, 2024

No description provided.

em230418 and others added 9 commits September 24, 2024 16:43
Co-authored-by: Ivan Yelizariev <[email protected]>
Co-authored-by: Rafael Manaev <[email protected]>
Co-authored-by: Ilmir Karamov <[email protected]>
Co-authored-by: Ildar Nasyrov <[email protected]>
Co-authored-by: Nicolas Jeudy <[email protected]>
Co-authored-by: Alexandr Kolushov <[email protected]>
Co-authored-by: Almas Giniatullin <[email protected]>
Co-authored-by: Denis Mudarisov <[email protected]>
Co-authored-by: Vildan Safin <[email protected]>
Co-authored-by: Eugene Molotov <[email protected]>
Co-authored-by: Victor Bykov <[email protected]>
Причина в том, что родительское меню само стало вызывать какое-то действие
odoo/odoo@7563b44
Copy link
Member

@em230418 em230418 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Помимо перечисленного тебе надо переоформить коммиты.
Сначала сделай бэкап своих изменений:

git branch 15.0-mig-project_task_subtask-2024-10-23

Далее перебазируйся на обновленную ветку 17.0. Я оставил комментарий git rebase.

Коммит который имел название "Обновил версию flake8 до 5.0.0" должен иметь название "[IMP] project_task_subtask: pre-commit auto fixes"

Далее следующим коммитом у тебя должно быть удаление всего, что связанно с sort/unsort. Тут оставил какие еще файлы надо еще удалить. И это должно быть в рамках одного коммита.

Остальные замечания потом

Comment on lines 64 to 99
<field name="name">project.task.kanban.subtasks</field>
<field name="model">project.task</field>
<field name="inherit_id" ref="project.view_task_kanban" />
<field name="arch" type="xml">
<xpath expr="//field[@name ='tag_ids']" position="after">
<field name="completion" invisible="1" />
<field name="subtask_ids" invisible="1" />
<field name="kanban_subtasks" invisible="1" />
<field name="completion_xml" invisible="1" />
</xpath>
<xpath expr="//div[hasclass('o_kanban_record_bottom')]" position="before">
<div>
<t t-raw="record.completion_xml.raw_value" />
<t t-raw="record.kanban_subtasks.raw_value" />
</div>
</xpath>
</field>
</record>

<record model="ir.ui.view" id="view_id">
<field name="name">project.task.subtask</field>
<field name="model">project.task.subtask</field>
<field name="arch" type="xml">
<form string="Subtask Message">
<sheet>
<group>
<field name="name" />
<field name="user_id" />
<field name="state" />
<field name="task_id" />
</group>
</sheet>
</form>
</field>
</record>

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Тут зачем-то убрал отступы и теперь GitHub считает, что тут были измения. Верни отступы.

Comment on lines +1 to +23
<?xml version="1.0" encoding="utf-8" ?>
<template xml:space="preserve">
<t t-name="SubtaskSortButtons">
<div>
<button
aria-label="Sort"
class="btn btn-sm btn-primary o_pager_sort"
type="button"
t-if="!check_button"
>
Sort
</button>
<button
aria-label="Unsort"
class="btn btn-sm btn-default o_pager_unsort"
type="button"
t-if="check_button"
>
Unsort
</button>
</div>
</t>
</template>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Удали этот файл. Это шаблон с удаленной кнопоку Sort/Unsort

Comment on lines 1 to 9
import odoo.tests


class TestUi(odoo.tests.HttpCase):
def test_01_subtask_sort_button(self):
self.env["ir.module.module"].search(
[("name", "=", "project_task_subtask")], limit=1
).state = "installed"
self.start_tour("/web", "task_subtask", login="admin")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Удали этот тест. Он связан с удаленной кнопкой Sort/Unsort.

rev: 3.9.2
rev: 5.0.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Перебазируйся на ветку, где это изменение уже есть. Выполни:

git fetch origin
git rebase origin/17.0

kanban_subtasks = fields.Text(compute="_compute_kanban_subtasks")
default_user = fields.Many2one("res.users", compute="_compute_default_user")
completion = fields.Integer(compute="_compute_completion")
completion_xml = fields.Text(compute="_compute_completion_xml")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Переделай в fields.Html. После чего должно нормально отображаться в канбане.

project_task_subtask/tests/__init__.py Outdated Show resolved Hide resolved
@Medeeet Medeeet closed this Oct 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants