From 27a969754268dd1bbd6221d4724a32a9dd3cd59d Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Sun, 25 Aug 2024 22:49:54 -0400
Subject: [PATCH] Temporary diabled Bulk Ticket Merge in the Main Ticket view
 as it was not allowing a tech to be assigned from that view

---
 ticket_bulk_merge_modal.php | 4 ++--
 tickets.php                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ticket_bulk_merge_modal.php b/ticket_bulk_merge_modal.php
index c55b37ed..572f6207 100644
--- a/ticket_bulk_merge_modal.php
+++ b/ticket_bulk_merge_modal.php
@@ -25,7 +25,7 @@
                             }
                             ?>
                         </div>
-                        <input type="text" class="form-control" id="merge_into_ticket_number" name="merge_into_ticket_number" placeholder="Ticket number" required onfocusout="merge_into_number_get_details()">
+                        <input type="text" class="form-control" id="merge_into_ticket_number" name="merge_into_ticket_number" placeholder="Ticket number" onfocusout="merge_into_number_get_details()">
                         <!-- Calls Javascript function merge_into_number_get_details() after leaving input field -->
                     </div>
                 </div>
@@ -36,7 +36,7 @@
                         <div class="input-group-prepend">
                             <span class="input-group-text"><i class="fa fa-fw fa-sticky-note"></i></span>
                         </div>
-                        <input type="text" class="form-control" name="merge_comment" placeholder="Comments" required>
+                        <input type="text" class="form-control" name="merge_comment" placeholder="Comments">
                     </div>
                 </div>
 
diff --git a/tickets.php b/tickets.php
index e81d38c3..883ad407 100644
--- a/tickets.php
+++ b/tickets.php
@@ -544,7 +544,7 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
                 <?php require_once "ticket_bulk_assign_modal.php"; ?>
                 <?php require_once "ticket_bulk_edit_priority_modal.php"; ?>
                 <?php require_once "ticket_bulk_reply_modal.php"; ?>
-                <?php require_once "ticket_bulk_merge_modal.php"; ?>
+                <?php // 2024-08-25 JQ Disabled not able to change assignee require_once "ticket_bulk_merge_modal.php"; ?>
                 <?php require_once "ticket_bulk_resolve_modal.php"; ?>
             </form>
             <?php require_once "pagination.php"; ?>