mirror of https://github.com/itflow-org/itflow
Add the ability to Create a ticket inside a project then auto assign it to the project
This commit is contained in:
parent
62b8ee9d30
commit
ad3ed68932
|
|
@ -1,8 +1,8 @@
|
|||
<div class="modal" id="addProjectTicketModal" tabindex="-1">
|
||||
<div class="modal" id="linkTicketModal" tabindex="-1">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content bg-dark">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>Adding Ticket to Project: <strong><?php echo $project_name; ?></strong></h5>
|
||||
<h5 class="modal-title"><i class="fas fa-fw fa-life-ring mr-2"></i>Link Ticket to Project: <strong><?php echo $project_name; ?></strong></h5>
|
||||
<button type="button" class="close text-white" data-dismiss="modal">
|
||||
<span>×</span>
|
||||
</button>
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
</div>
|
||||
|
||||
<div class="modal-footer bg-white">
|
||||
<button type="submit" name="add_project_ticket" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Add</button>
|
||||
<button type="submit" name="link_ticket_to_project" class="btn btn-primary text-bold"><i class="fas fa-check mr-2"></i>Link</button>
|
||||
<button type="button" class="btn btn-light" data-dismiss="modal"><i class="fas fa-times mr-2"></i>Cancel</button>
|
||||
</div>
|
||||
</form>
|
||||
|
|
@ -9,6 +9,10 @@
|
|||
</div>
|
||||
<form action="post.php" method="post" autocomplete="off">
|
||||
|
||||
<?php if (isset($_GET['project_id'])) { ?>
|
||||
<input type="hidden" name="project" value="<?php echo intval($_GET['project_id']); ?>">
|
||||
<?php } ?>
|
||||
|
||||
<div class="modal-body bg-white">
|
||||
|
||||
<?php if (isset($_GET['client_id'])) { ?>
|
||||
|
|
@ -410,14 +414,14 @@
|
|||
<span class="input-group-text"><i class="fa fa-fw fa-project-diagram"></i></span>
|
||||
</div>
|
||||
<select class="form-control select2" name="project">
|
||||
<option value="0">- None -</option>
|
||||
<option value="0">- Select Project -</option>
|
||||
<?php
|
||||
|
||||
$sql_projects = mysqli_query($mysqli, "SELECT project_id, project_name FROM projects WHERE project_client_id = $client_id AND project_completed_at IS NULL AND project_archived_at IS NULL ORDER BY project_name ASC");
|
||||
while ($row = mysqli_fetch_array($sql_projects)) {
|
||||
$project_id_select = intval($row['project_id']);
|
||||
$project_name_select = nullable_htmlentities($row['project_name']); ?>
|
||||
<option value="<?php echo $project_id_select; ?>"><?php echo $project_name_select; ?></option>
|
||||
<option <?php if (isset($_GET['project_id']) && $project_id_select == $_GET['project_id']) { echo "selected"; } ?> value="<?php echo $project_id_select; ?>"><?php echo $project_name_select; ?></option>
|
||||
|
||||
<?php } ?>
|
||||
</select>
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@ if (isset($_GET['delete_project'])) {
|
|||
header("Location: " . $_SERVER["HTTP_REFERER"]);
|
||||
}
|
||||
|
||||
if (isset($_POST['add_project_ticket'])) {
|
||||
if (isset($_POST['link_ticket_to_project'])) {
|
||||
|
||||
enforceUserPermission('module_support', 2);
|
||||
$project_id = intval($_POST['project_id']);
|
||||
|
|
|
|||
|
|
@ -187,9 +187,26 @@ if (isset($_GET['project_id'])) {
|
|||
</a>
|
||||
<?php } ?>
|
||||
<?php if (empty($project_completed_at)) { ?>
|
||||
<button type="button" class="btn btn-primary btn-sm" href="#" data-toggle="modal" data-target="#addProjectTicketModal">
|
||||
<i class="fas fa-fw fa-plus mr-2"></i>Add Ticket
|
||||
</button>
|
||||
<div class="dropdown mr-2">
|
||||
<button class="btn btn-primary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown">
|
||||
<i class="fas fa-fw fa-plus mr-2"></i>New
|
||||
</button>
|
||||
<div class="dropdown-menu">
|
||||
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addTicketModal">
|
||||
<i class="fas fa-fw fa-life-ring mr-2"></i>Ticket
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="dropdown">
|
||||
<button class="btn btn-outline-primary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown">
|
||||
<i class="fas fa-fw fa-link mr-2"></i>Link
|
||||
</button>
|
||||
<div class="dropdown-menu">
|
||||
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#linkTicketModal">
|
||||
<i class="fas fa-fw fa-life-ring mr-2"></i>Ticket
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
<div class="dropdown dropleft text-center ml-3">
|
||||
<button class="btn btn-secondary btn-sm" type="button" id="dropdownMenuButton" data-toggle="dropdown">
|
||||
|
|
@ -410,7 +427,8 @@ if (isset($_GET['project_id'])) {
|
|||
|
||||
<?php
|
||||
|
||||
require_once "modals/project_ticket_add_modal.php";
|
||||
require_once "modals/project_link_ticket_modal.php";
|
||||
require_once "modals/ticket_add_modal.php";
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue