Move Attachments to Assignment in new ticket get rid of help texts in reply for attachments and update changelog

This commit is contained in:
johnnyq
2026-07-29 18:39:43 -04:00
parent 2395a3ee16
commit 729d22d19b
4 changed files with 37 additions and 16 deletions

View File

@@ -203,11 +203,6 @@ ob_start();
</div>
<?php } ?>
<div class="form-group">
<label><i class="fa fa-fw fa-paperclip mr-1"></i>Attachments</label>
<input type="file" class="form-control-file" name="attachments[]" multiple accept=".jpg, .jpeg, .gif, .png, .webp, .pdf, .txt, .md, .doc, .docx, .odt, .csv, .xls, .xlsx, .ods, .pptx, .odp, .zip, .tar, .gz, .xml, .msg, .json, .wav, .mp3, .ogg, .mov, .mp4, .av1, .ovpn">
</div>
</div>
<div class="tab-pane fade" id="pills-add-tasks">
@@ -302,6 +297,11 @@ ob_start();
</div>
</div>
<div class="form-group">
<label><i class="fa fa-fw fa-paperclip mr-1"></i>Attachments</label>
<input type="file" class="form-control-file" name="attachments[]" multiple accept=".jpg, .jpeg, .gif, .png, .webp, .pdf, .txt, .md, .doc, .docx, .odt, .csv, .xls, .xlsx, .ods, .pptx, .odp, .zip, .tar, .gz, .xml, .msg, .json, .wav, .mp3, .ogg, .mov, .mp4, .av1, .ovpn">
</div>
</div>
</div>

View File

@@ -315,12 +315,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
data-modal-url="modals/recurring_ticket/recurring_ticket_edit.php?id=<?= $recurring_ticket_id ?>">
<?= $recurring_ticket_subject ?>
</a>
<?php if ($recurring_ticket_template_name) { ?>
<span title="Template: <?= $recurring_ticket_template_name ?>"
<i class='fas fa-puzzle-piece text-secondary ml-1'></i>
</span>
<?php } ?>
<?php if ($recurring_ticket_task_count) { ?>
<span class="badge badge-secondary"
data-toggle="tooltip"
data-placement="top"
title="Adds <?= $recurring_ticket_task_count ?> task<?php if ($recurring_ticket_task_count != 1) { echo "s"; } ?> to each ticket raised<?php if ($recurring_ticket_template_name) { ?>, from template: <?= $recurring_ticket_template_name ?><?php } ?>">
<i class="fa fa-fw fa-tasks"></i><?= $recurring_ticket_task_count ?>
<span title="Adds <?= $recurring_ticket_task_count ?> Tasks">
<i class="fas fa-fw fa-tasks mr-1"></i><?= $recurring_ticket_task_count ?>
</span>
<?php } ?>
</td>

View File

@@ -599,8 +599,8 @@ if (isset($_GET['ticket_id'])) {
<a target='_blank' class='mr-1 ml-1' href='ticket_attachment.php?attachment_id=<?= $ticket_attachment_id; ?>&action=view'>[View]</a><a href='ticket_attachment.php?attachment_id=<?= $ticket_attachment_id; ?>'>[Download]</a><?php if (lookupUserPermission("module_support") >= 3) { ?><a class='confirm-link ml-1 text-danger' href='post.php?delete_ticket_attachment=<?= $ticket_attachment_id ?>&csrf_token=<?= $_SESSION['csrf_token'] ?>'>[Delete]</a><?php } ?>
</td>
</tr>
<?php
<?php
}
?>
</table>
@@ -643,9 +643,7 @@ if (isset($_GET['ticket_id'])) {
</div>
<div class="form-group">
<label class="text-muted small mb-1"><i class="fa fa-fw fa-paperclip mr-1"></i>Attachments</label>
<input type="file" class="form-control-file" name="attachments[]" multiple accept=".jpg, .jpeg, .gif, .png, .webp, .pdf, .txt, .md, .doc, .docx, .odt, .csv, .xls, .xlsx, .ods, .pptx, .odp, .zip, .tar, .gz, .xml, .msg, .json, .wav, .mp3, .ogg, .mov, .mp4, .av1, .ovpn">
<small class="form-text text-muted">Stored against this reply, or against the ticket itself if you submit without any text. A Public + Email reply sends them to the contact and any watchers.</small>
</div>
<div class="form-row">
@@ -839,8 +837,8 @@ if (isset($_GET['ticket_id'])) {
<a target='_blank' class='mr-1 ml-1' href='ticket_attachment.php?attachment_id=<?= $ticket_attachment_id; ?>&action=view'>[View]</a><a href='ticket_attachment.php?attachment_id=<?= $ticket_attachment_id; ?>'>[Download]</a><?php if (lookupUserPermission("module_support") >= 3) { ?><a class='confirm-link ml-1 text-danger' href='post.php?delete_ticket_attachment=<?= $ticket_attachment_id ?>&csrf_token=<?= $_SESSION['csrf_token'] ?>'>[Delete]</a><?php } ?>
</td>
</tr>
<?php
<?php
}
?>
</table>