Skip to content

Commit 3c1f168

Browse files
committed
[UPD] helpdesk_mgmt: Update from OCA/helpdesk
1 parent 1895744 commit 3c1f168

32 files changed

+4297
-1364
lines changed

helpdesk_mgmt/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Helpdesk Management
77
!! This file is generated by oca-gen-addon-readme !!
88
!! changes will be overwritten. !!
99
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
10-
!! source digest: sha256:71aa322793eba273a72d2cf000f8919114a8698300a6b8d682348d22a5c658b8
10+
!! source digest: sha256:7270ae5cca6d8d5c04cbb1f44311d1f572e945d964b42152e92aa0c3b9b85aa6
1111
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
1212
1313
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

helpdesk_mgmt/__manifest__.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"name": "Helpdesk Management",
55
"summary": """
66
Helpdesk""",
7-
"version": "16.0.2.2.2",
7+
"version": "16.0.2.7.0",
88
"license": "AGPL-3",
99
"category": "After-Sales",
1010
"author": "AdaptiveCity, "
@@ -37,6 +37,7 @@
3737
"assets": {
3838
"web.assets_frontend": [
3939
"helpdesk_mgmt/static/src/js/new_ticket.js",
40+
"helpdesk_mgmt/static/src/js/portal.js", # TODO: push to OCA
4041
],
4142
},
4243
"development_status": "Beta",

helpdesk_mgmt/controllers/main.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,18 @@ def submit_ticket(self, **kw):
107107
new_ticket = request.env["helpdesk.ticket"].sudo().create(vals)
108108
new_ticket.message_subscribe(partner_ids=request.env.user.partner_id.ids)
109109
if kw.get("attachment"):
110+
IrAttachment = request.env["ir.attachment"]
111+
attachment_ids = IrAttachment
110112
for c_file in request.httprequest.files.getlist("attachment"):
111113
data = c_file.read()
112114
if c_file.filename:
113-
request.env["ir.attachment"].sudo().create(
115+
attachment_ids += IrAttachment.sudo().create(
114116
{
115117
"name": c_file.filename,
116118
"datas": base64.b64encode(data),
117119
"res_model": "helpdesk.ticket",
118120
"res_id": new_ticket.id,
119121
}
120122
)
123+
attachment_ids.sudo().generate_access_token()
121124
return werkzeug.utils.redirect("/my/ticket/%s" % new_ticket.id)

helpdesk_mgmt/controllers/myaccount.py

+11
Original file line numberDiff line numberDiff line change
@@ -185,11 +185,22 @@ def _ticket_get_page_view_values(self, ticket, access_token, **kwargs):
185185
closed_stages = ticket.team_id._get_applicable_stages().filtered(
186186
lambda s: s.close_from_portal
187187
)
188+
files = (
189+
request.env["ir.attachment"]
190+
.sudo()
191+
.search(
192+
[
193+
("res_model", "=", "helpdesk.ticket"),
194+
("res_id", "=", ticket.id),
195+
]
196+
)
197+
)
188198
values = {
189199
"closed_stages": closed_stages, # used to display close buttons
190200
"page_name": "ticket",
191201
"ticket": ticket,
192202
"user": request.env.user,
203+
"files": files,
193204
}
194205
return self._get_page_view_values(
195206
ticket, access_token, values, "my_tickets_history", False, **kwargs

helpdesk_mgmt/demo/helpdesk_demo.xml

+11-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@
2525
<field eval="&quot;General Alias for tickets&quot;" name="alias_name" />
2626
<field ref="model_helpdesk_ticket" name="alias_model_id" />
2727
</record>
28+
<record id="mail_alias_2" model="mail.alias">
29+
<field eval="&quot;General Alias 2 for tickets&quot;" name="alias_name" />
30+
<field ref="model_helpdesk_ticket" name="alias_model_id" />
31+
</record>
32+
<record id="mail_alias_3" model="mail.alias">
33+
<field eval="&quot;General Alias 3 for tickets&quot;" name="alias_name" />
34+
<field ref="model_helpdesk_ticket" name="alias_model_id" />
35+
</record>
36+
2837
<!-- Teams -->
2938
<record id="helpdesk_team_1" model="helpdesk.ticket.team">
3039
<field eval="&quot;Localization team&quot;" name="name" />
@@ -46,15 +55,15 @@
4655
<field eval="&quot;1&quot;" name="active" />
4756
<field name="category_ids" eval="[(6,0,[ref('helpdesk_category_1')])]" />
4857
<field name="company_id" ref="base.main_company" />
49-
<field name="alias_id" ref="mail_alias_1" />
58+
<field name="alias_id" ref="mail_alias_2" />
5059
</record>
5160
<record id="helpdesk_team_3" model="helpdesk.ticket.team">
5261
<field eval="&quot;Consultants&quot;" name="name" />
5362
<field name="user_ids" eval="[(6,0,[ref('base.user_root')])]" />
5463
<field eval="&quot;1&quot;" name="active" />
5564
<field name="category_ids" eval="[(6,0,[ref('helpdesk_category_2')])]" />
5665
<field name="company_id" ref="base.main_company" />
57-
<field name="alias_id" ref="mail_alias_1" />
66+
<field name="alias_id" ref="mail_alias_3" />
5867
</record>
5968
<!-- Tags -->
6069
<record id="helpdesk_tag_1" model="helpdesk.ticket.tag">

0 commit comments

Comments
 (0)