Merge PR OCA#43 into 11.0

Signed-off-by pedrobaeza
nguyenductamlhp · Jul 26, 2019 · e791608 · e791608
2 parents ac1a517 + da5fc45
commit e791608
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/helpdesk_mgmt/__manifest__.py b/helpdesk_mgmt/__manifest__.py
@@ -4,7 +4,7 @@
     'name': 'Helpdesk Management',
     'summary': """
         Helpdesk""",
-    'version': '11.0.1.2.0',
+    'version': '11.0.1.3.0',
     'license': 'AGPL-3',
     'category': 'After-Sales',
     'author': 'AdaptiveCity, '

diff --git a/helpdesk_mgmt/controllers/main.py b/helpdesk_mgmt/controllers/main.py
@@ -1,5 +1,5 @@
-import werkzeug
 import logging
+import werkzeug
 import odoo.http as http
 _logger = logging.getLogger(__name__)
 
@@ -11,7 +11,10 @@ def support_ticket_close(self, **kw):
         """Close the support ticket"""
         values = {}
         for field_name, field_value in kw.items():
-            values[field_name] = field_value
+            if field_name.endswith('_id'):
+                values[field_name] = int(field_value)
+            else:
+                values[field_name] = field_value
         ticket = http.request.env['helpdesk.ticket'].sudo().\
             search([('id', '=', values['ticket_id'])])
         ticket.stage_id = values.get('stage_id')

diff --git a/helpdesk_mgmt/controllers/myaccount.py b/helpdesk_mgmt/controllers/myaccount.py
@@ -24,7 +24,7 @@ def _helpdesk_ticket_check_access(self, ticket_id):
             ticket.check_access_rights('read')
             ticket.check_access_rule('read')
         except AccessError:
-                raise
+            raise
         return ticket_sudo
 
     @http.route(
@@ -99,7 +99,7 @@ def portal_my_tickets(
             'searchbar_filters': searchbar_filters,
             'filterby': filterby,
         })
-        return request.render("helpdesk.portal_my_tickets", values)
+        return request.render("helpdesk_mgmt.portal_my_tickets", values)
 
     @http.route(['/my/ticket/<int:ticket_id>'], type='http', website=True)
     def portal_my_ticket(self, ticket_id=None, **kw):
@@ -108,7 +108,8 @@ def portal_my_ticket(self, ticket_id=None, **kw):
         except AccessError:
             return request.redirect('/my')
         values = self._ticket_get_page_view_values(ticket_sudo, **kw)
-        return request.render("helpdesk.portal_helpdesk_ticket_page", values)
+        return request.render("helpdesk_mgmt.portal_helpdesk_ticket_page",
+                              values)
 
     def _ticket_get_page_view_values(self, ticket, **kwargs):
         closed_stages = request.env['helpdesk.ticket.stage'].search(