Skip to content

Commit

Permalink
[MIG] dms: Migration from 15.0 to 16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
KB committed Sep 19, 2023
1 parent 87340fd commit 4846a14
Show file tree
Hide file tree
Showing 43 changed files with 1,126 additions and 357 deletions.
29 changes: 14 additions & 15 deletions dms/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,18 @@
{
"name": "Document Management System",
"summary": """Document Management System for Odoo""",
"version": "15.0.1.8.2",
"version": "16.0.1.0.0",
"category": "Document Management",
"license": "LGPL-3",
"website": "https://github.com/OCA/dms",
"author": "MuK IT, Tecnativa, Odoo Community Association (OCA)",
"depends": [
"web_drop_target",
# "web_drop_target", #TODO only exist in v15
"mail",
"http_routing",
"portal",
"mail_preview_base",
# "mail_preview_base", #TODO only exist in v15
"base",
],
"data": [
"security/security.xml",
Expand All @@ -32,20 +33,18 @@
"views/dms_portal_templates.xml",
],
"assets": {
"mail.assets_messaging": [
("include", "mail.assets_core_messaging"),
"dms/static/src/models/*.js",
],
"web.assets_backend": [
"dms/static/src/scss/variables.scss",
"dms/static/src/scss/file_kanban.scss",
"dms/static/src/scss/directory_kanban.scss",
"dms/static/src/js/fields/path.js",
"dms/static/src/js/views/many_drop_target.js",
"dms/static/src/js/views/search_panel.esm.js",
"dms/static/src/js/views/file_list_controller.js",
"dms/static/src/js/views/file_list_view.js",
"dms/static/src/js/views/file_kanban_controller.js",
"dms/static/src/js/views/file_kanban_renderer.js",
"dms/static/src/js/views/file_kanban_view.js",
"dms/static/src/scss/*",
"dms/static/src/js/fields/*",
"dms/static/src/js/views/*.esm.js",
"dms/static/src/js/views/*.xml",
"dms/static/src/js/views/fields/binary/*",
],
"web.assets_qweb": ["dms/static/src/xml/views.xml"],
# "web.assets_qweb": ["dms/static/src/xml/views.xml"],
"web.assets_frontend": ["dms/static/src/js/dms_portal_tour.js"],
},
"demo": [
Expand Down
13 changes: 7 additions & 6 deletions dms/controllers/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ def document_onboarding_directory(self):
check = request.env.user.has_group("dms.group_dms_manager")
if check and not closed:
return {
"html": request.env.ref(
"dms.document_onboarding_directory_panel"
)._render(
"html": request.env["ir.qweb"]._render(
request.env.ref("dms.document_onboarding_directory_panel").id,
{
"state": company.get_and_update_documents_onboarding_state(),
"company": company,
}
},
)
}

return {}

@http.route("/dms/document_onboarding/file", auth="user", type="json")
Expand All @@ -30,11 +30,12 @@ def document_onboarding_file(self):
check = request.env.user.has_group("dms.group_dms_manager")
if check and not closed:
return {
"html": request.env.ref("dms.document_onboarding_file_panel")._render(
"html": request.env["ir.qweb"]._render(
request.env.ref("dms.document_onboarding_file_panel").id,
{
"state": company.get_and_update_documents_onboarding_state(),
"company": company,
}
},
)
}
return {}
Expand Down
4 changes: 2 additions & 2 deletions dms/controllers/portal.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
import base64

from odoo import _, http
from odoo.http import request
from odoo.http import content_disposition, request
from odoo.osv.expression import OR

from odoo.addons.portal.controllers.portal import CustomerPortal
from odoo.addons.web.controllers.main import content_disposition, ensure_db
from odoo.addons.web.controllers.utils import ensure_db


class CustomerPortal(CustomerPortal):
Expand Down
Loading

0 comments on commit 4846a14

Please sign in to comment.