diff --git a/odoo_website_helpdesk/controller/ticket_group_by.py b/odoo_website_helpdesk/controller/ticket_group_by.py index c3197ebac..49bae88e3 100644 --- a/odoo_website_helpdesk/controller/ticket_group_by.py +++ b/odoo_website_helpdesk/controller/ticket_group_by.py @@ -9,14 +9,14 @@ class TicketGroupBy(http.Controller): group_value = kwargs.get("search_value") if group_value == '0': context = [] - tickets = request.env["help.ticket"].search([]) + tickets = request.env["help.ticket"].search([('user_id', '=', request.env.user.id)]) context.append(tickets) if group_value == '1': context = [] stage_ids = request.env['ticket.stage'].search([]) for stage in stage_ids: ticket_ids = request.env['help.ticket'].search([ - ('stage_id', '=', stage.id) + ('stage_id', '=', stage.id), ('user_id', '=', request.env.user.id) ]) if ticket_ids: context.append({ @@ -28,7 +28,7 @@ class TicketGroupBy(http.Controller): type_ids = request.env['helpdesk.types'].search([]) for types in type_ids: ticket_ids_1 = request.env['help.ticket'].search([ - ('ticket_type', '=', types.id) + ('ticket_type', '=', types.id), ('user_id', '=', request.env.user.id) ]) if ticket_ids_1: context.append({ @@ -42,4 +42,4 @@ class TicketGroupBy(http.Controller): response = http.Response( template='odoo_website_helpdesk.ticket_group_by_table', qcontext=values) - return response.render() + return response.render() \ No newline at end of file diff --git a/odoo_website_helpdesk/controller/website_form.py b/odoo_website_helpdesk/controller/website_form.py index 50a1dd72e..ace4c05c4 100644 --- a/odoo_website_helpdesk/controller/website_form.py +++ b/odoo_website_helpdesk/controller/website_form.py @@ -96,6 +96,9 @@ class WebsiteFormInherit(WebsiteForm): request.session['form_builder_id'] = ticket_id.id return json.dumps({'id': ticket_id.id}) else: + lowest_sequence = tickets.filtered( + lambda x: x.sequence == min(sequence)) + lowest_stage_id = lowest_sequence rec_val = { 'customer_name': kwargs.get('customer_name'), 'subject': kwargs.get('subject'), diff --git a/odoo_website_helpdesk/doc/RELEASE_NOTES.md b/odoo_website_helpdesk/doc/RELEASE_NOTES.md index 4966fc975..6ccbdf3c6 100644 --- a/odoo_website_helpdesk/doc/RELEASE_NOTES.md +++ b/odoo_website_helpdesk/doc/RELEASE_NOTES.md @@ -1,6 +1,6 @@ ## Module -#### 09.11.2022 +#### 01.09.2023 #### Version 16.0.1.0.0 #### ADD - Initial commit for Website Helpdesk Support Ticket diff --git a/odoo_website_helpdesk/models/helpdesk.py b/odoo_website_helpdesk/models/helpdesk.py index f7273c84d..11d2cfaaf 100644 --- a/odoo_website_helpdesk/models/helpdesk.py +++ b/odoo_website_helpdesk/models/helpdesk.py @@ -129,6 +129,8 @@ class HelpDeskTicket(models.Model): 'Not', default=False) merge_count = fields.Integer(string='Merge Count', help='Merged Tickets ' 'Count') + active = fields.Boolean(default=True, help='Active', string='Active') + @api.onchange('team_id', 'team_head') def team_leader_domain(self): diff --git a/odoo_website_helpdesk/security/ir.model.access.csv b/odoo_website_helpdesk/security/ir.model.access.csv index da26e08f8..2240feae7 100644 --- a/odoo_website_helpdesk/security/ir.model.access.csv +++ b/odoo_website_helpdesk/security/ir.model.access.csv @@ -10,7 +10,7 @@ access_helpdesk_tag_user,access.helpdesk.tag,model_helpdesk_tag,odoo_website_hel access_helpdesk_tag_leader,access.helpdesk.tag,model_helpdesk_tag,odoo_website_helpdesk.helpdesk_team_leader,1,1,1,1 access_helpdesk_tag_manager,access.helpdesk.tag,model_helpdesk_tag,odoo_website_helpdesk.helpdesk_manager,1,1,1,1 -access_help_ticket_stage_user,access.ticket.stage,model_ticket_stage,,1,1,1,1 +access_help_ticket_stage_user,access.ticket.stage,model_ticket_stage,odoo_website_helpdesk.helpdesk_user,1,1,1,1 access_helpdesk_types_user,access.helpdesk.types,model_helpdesk_types,odoo_website_helpdesk.helpdesk_user,1,0,0,0 access_helpdesk_types_leader,access.helpdesk.types,model_helpdesk_types,odoo_website_helpdesk.helpdesk_team_leader,1,1,1,1