[UPD] helpdesk_mgmt: Update from OCA/helpdesk

onesteinbv · Jan 24, 2025 · 3c1f168 · 3c1f168
1 parent 1895744
commit 3c1f168
Show file tree

Hide file tree

Showing 32 changed files with 4,297 additions and 1,364 deletions.
diff --git a/helpdesk_mgmt/README.rst b/helpdesk_mgmt/README.rst
@@ -7,7 +7,7 @@ Helpdesk Management
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:71aa322793eba273a72d2cf000f8919114a8698300a6b8d682348d22a5c658b8
+   !! source digest: sha256:7270ae5cca6d8d5c04cbb1f44311d1f572e945d964b42152e92aa0c3b9b85aa6
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/helpdesk_mgmt/__manifest__.py b/helpdesk_mgmt/__manifest__.py
@@ -4,7 +4,7 @@
     "name": "Helpdesk Management",
     "summary": """
         Helpdesk""",
-    "version": "16.0.2.2.2",
+    "version": "16.0.2.7.0",
     "license": "AGPL-3",
     "category": "After-Sales",
     "author": "AdaptiveCity, "
@@ -37,6 +37,7 @@
     "assets": {
         "web.assets_frontend": [
             "helpdesk_mgmt/static/src/js/new_ticket.js",
+            "helpdesk_mgmt/static/src/js/portal.js",  # TODO: push to OCA
         ],
     },
     "development_status": "Beta",

diff --git a/helpdesk_mgmt/controllers/main.py b/helpdesk_mgmt/controllers/main.py
@@ -107,15 +107,18 @@ def submit_ticket(self, **kw):
         new_ticket = request.env["helpdesk.ticket"].sudo().create(vals)
         new_ticket.message_subscribe(partner_ids=request.env.user.partner_id.ids)
         if kw.get("attachment"):
+            IrAttachment = request.env["ir.attachment"]
+            attachment_ids = IrAttachment
             for c_file in request.httprequest.files.getlist("attachment"):
                 data = c_file.read()
                 if c_file.filename:
-                    request.env["ir.attachment"].sudo().create(
+                    attachment_ids += IrAttachment.sudo().create(
                         {
                             "name": c_file.filename,
                             "datas": base64.b64encode(data),
                             "res_model": "helpdesk.ticket",
                             "res_id": new_ticket.id,
                         }
                     )
+            attachment_ids.sudo().generate_access_token()
         return werkzeug.utils.redirect("/my/ticket/%s" % new_ticket.id)
diff --git a/helpdesk_mgmt/controllers/myaccount.py b/helpdesk_mgmt/controllers/myaccount.py
@@ -185,11 +185,22 @@ def _ticket_get_page_view_values(self, ticket, access_token, **kwargs):
         closed_stages = ticket.team_id._get_applicable_stages().filtered(
             lambda s: s.close_from_portal
         )
+        files = (
+            request.env["ir.attachment"]
+            .sudo()
+            .search(
+                [
+                    ("res_model", "=", "helpdesk.ticket"),
+                    ("res_id", "=", ticket.id),
+                ]
+            )
+        )
         values = {
             "closed_stages": closed_stages,  # used to display close buttons
             "page_name": "ticket",
             "ticket": ticket,
             "user": request.env.user,
+            "files": files,
         }
         return self._get_page_view_values(
             ticket, access_token, values, "my_tickets_history", False, **kwargs

diff --git a/helpdesk_mgmt/demo/helpdesk_demo.xml b/helpdesk_mgmt/demo/helpdesk_demo.xml
@@ -25,6 +25,15 @@
         <field eval="&quot;General Alias for tickets&quot;" name="alias_name" />
         <field ref="model_helpdesk_ticket" name="alias_model_id" />
     </record>
+    <record id="mail_alias_2" model="mail.alias">
+        <field eval="&quot;General Alias 2 for tickets&quot;" name="alias_name" />
+        <field ref="model_helpdesk_ticket" name="alias_model_id" />
+    </record>
+    <record id="mail_alias_3" model="mail.alias">
+        <field eval="&quot;General Alias 3 for tickets&quot;" name="alias_name" />
+        <field ref="model_helpdesk_ticket" name="alias_model_id" />
+    </record>
+
     <!-- Teams -->
     <record id="helpdesk_team_1" model="helpdesk.ticket.team">
         <field eval="&quot;Localization team&quot;" name="name" />
@@ -46,15 +55,15 @@
         <field eval="&quot;1&quot;" name="active" />
         <field name="category_ids" eval="[(6,0,[ref('helpdesk_category_1')])]" />
         <field name="company_id" ref="base.main_company" />
-        <field name="alias_id" ref="mail_alias_1" />
+        <field name="alias_id" ref="mail_alias_2" />
     </record>
     <record id="helpdesk_team_3" model="helpdesk.ticket.team">
         <field eval="&quot;Consultants&quot;" name="name" />
         <field name="user_ids" eval="[(6,0,[ref('base.user_root')])]" />
         <field eval="&quot;1&quot;" name="active" />
         <field name="category_ids" eval="[(6,0,[ref('helpdesk_category_2')])]" />
         <field name="company_id" ref="base.main_company" />
-        <field name="alias_id" ref="mail_alias_1" />
+        <field name="alias_id" ref="mail_alias_3" />
     </record>
     <!-- Tags -->
     <record id="helpdesk_tag_1" model="helpdesk.ticket.tag">