Netsyms
/
Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#209 Add sort property, and statuses page honors sort

Browse Source
merge-requests/2/head
Mike Koch 9 years ago
parent 05063218c4
commit a131b7842e
2 changed files with 56 additions and 25 deletions
Show Stats Download Patch File Download Diff File

76
admin/manage_statuses.php
Unescape Escape View File

@ -5,6 +5,7 @@ define('HESK_PATH','../');
/* Get all the required files and functions */ /* Get all the required files and functions */
require(HESK_PATH . 'hesk_settings.inc.php'); require(HESK_PATH . 'hesk_settings.inc.php');
require(HESK_PATH . 'modsForHesk_settings.inc.php');
require(HESK_PATH . 'inc/common.inc.php'); require(HESK_PATH . 'inc/common.inc.php');
require(HESK_PATH . 'inc/admin_functions.inc.php'); require(HESK_PATH . 'inc/admin_functions.inc.php');
hesk_load_database_functions(); hesk_load_database_functions();
@ -84,15 +85,18 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
$numOfStatusesRS = hesk_dbQuery('SELECT 1 FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses`'); $numOfStatusesRS = hesk_dbQuery('SELECT 1 FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses`');
$numberOfStatuses = hesk_dbNumRows($numOfStatusesRS); $numberOfStatuses = hesk_dbNumRows($numOfStatusesRS);
$statusesSql = 'SELECT `ID`, `IsAutocloseOption`, `TextColor`, `Closable`, `IsClosed` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` ORDER BY `sort` ASC'; $statusesSql = 'SELECT * FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` ORDER BY `sort` ASC';
$closedStatusesSql = 'SELECT `ID`, `IsClosedByClient` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` WHERE `IsClosed` = 1 ORDER BY `sort` ASC';
$openStatusesSql = 'SELECT `ID`, `IsNewTicketStatus`, `IsStaffReopenedStatus`, `IsDefaultStaffReplyStatus` FROM
`'.hesk_dbEscape($hesk_settings['db_pfix']).'statuses` WHERE `IsClosed` = 0 ORDER BY `sort` ASC';
$statusesRS = hesk_dbQuery($statusesSql); $statusesRS = hesk_dbQuery($statusesSql);
$statuses = array(); $statuses = array();
while ($row = hesk_dbFetchAssoc($statusesRS)) { while ($row = hesk_dbFetchAssoc($statusesRS)) {
array_push($statuses, $row); $row['text'] = mfh_getDisplayTextForStatusId($row['ID']);
$statuses[$row['text']] = $row;
} }
if ($modsForHesk_settings['statuses_order_column'] == 'name') {
ksort($statuses);
}
?> ?>
<form class="form-horizontal" method="post" action="manage_statuses.php" role="form"> <form class="form-horizontal" method="post" action="manage_statuses.php" role="form">
<div class="panel panel-default"> <div class="panel panel-default">
@ -121,11 +125,11 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<tbody> <tbody>
<?php <?php
$j = 1; $j = 1;
foreach ($statuses as $row): foreach ($statuses as $key => $row):
?> ?>
<tr id="s<?php echo $row['ID']; ?>_row"> <tr id="s<?php echo $row['ID']; ?>_row">
<td style="color: <?php echo $row['TextColor']; ?>; font-weight: bold"> <td style="color: <?php echo $row['TextColor']; ?>; font-weight: bold">
<?php echo mfh_getDisplayTextForStatusId($row['ID']); ?> <?php echo $row['text']; ?>
</td> </td>
<td> <td>
<?php <?php
@ -175,9 +179,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<select name="newTicket" class="form-control" id="newTicket"> <select name="newTicket" class="form-control" id="newTicket">
<?php <?php
$statusesRS = hesk_dbQuery($openStatusesSql); foreach ($statuses as $key => $row)
while ($row = $statusesRS->fetch_assoc())
{ {
if ($row['IsClosed'] == 1) {
continue;
}
$selectedEcho = ($row['IsNewTicketStatus'] == 1) ? 'selected="selected"' : ''; $selectedEcho = ($row['IsNewTicketStatus'] == 1) ? 'selected="selected"' : '';
echo '<option value="'.$row['ID'].'" '.$selectedEcho.'>'.mfh_getDisplayTextForStatusId($row['ID']).'</option>'; echo '<option value="'.$row['ID'].'" '.$selectedEcho.'>'.mfh_getDisplayTextForStatusId($row['ID']).'</option>';
} }
@ -190,9 +197,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<select name="closedByClient" class="form-control" id="closedByClient"> <select name="closedByClient" class="form-control" id="closedByClient">
<?php <?php
$statusesRS = hesk_dbQuery($closedStatusesSql); foreach ($statuses as $key => $row)
while ($row = $statusesRS->fetch_assoc())
{ {
if ($row['IsClosed'] == 0) {
continue;
}
$selectedEcho = ($row['IsClosedByClient'] == 1) ? 'selected="selected"' : ''; $selectedEcho = ($row['IsClosedByClient'] == 1) ? 'selected="selected"' : '';
echo '<option value="'.$row['ID'].'" '.$selectedEcho.'>'.mfh_getDisplayTextForStatusId($row['ID']).'</option>'; echo '<option value="'.$row['ID'].'" '.$selectedEcho.'>'.mfh_getDisplayTextForStatusId($row['ID']).'</option>';
} }
@ -205,9 +215,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<select name="replyFromClient" class="form-control" id="replyFromClient"> <select name="replyFromClient" class="form-control" id="replyFromClient">
<?php <?php
$statusesRS = hesk_dbQuery($openStatusesSql); foreach ($statuses as $key => $row)
while ($row = $statusesRS->fetch_assoc())
{ {
if ($row['IsClosed'] == 1) {
continue;
}
$selectedEcho = ($row['IsCustomerReplyStatus'] == 1) ? 'selected="selected"' : ''; $selectedEcho = ($row['IsCustomerReplyStatus'] == 1) ? 'selected="selected"' : '';
echo '<option value="'.$row['ID'].'" '.$selectedEcho.'>'.mfh_getDisplayTextForStatusId($row['ID']).'</option>'; echo '<option value="'.$row['ID'].'" '.$selectedEcho.'>'.mfh_getDisplayTextForStatusId($row['ID']).'</option>';
} }
@ -220,9 +233,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<select name="staffClosedOption" class="form-control" id="staffClosedOption"> <select name="staffClosedOption" class="form-control" id="staffClosedOption">
<?php <?php
$statusesRS = hesk_dbQuery($closedStatusesSql); foreach ($statuses as $key => $row)
while ($row = $statusesRS->fetch_assoc())
{ {
if ($row['IsClosed'] == 0) {
continue;
}
$selectedEcho = ($row['IsStaffClosedOption'] == 1) ? 'selected="selected"' : ''; $selectedEcho = ($row['IsStaffClosedOption'] == 1) ? 'selected="selected"' : '';
echo '<option value="'.$row['ID'].'" '.$selectedEcho.'>'.mfh_getDisplayTextForStatusId($row['ID']).'</option>'; echo '<option value="'.$row['ID'].'" '.$selectedEcho.'>'.mfh_getDisplayTextForStatusId($row['ID']).'</option>';
} }
@ -235,9 +251,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<select name="staffReopenedStatus" class="form-control" id="staffReopenedStatus"> <select name="staffReopenedStatus" class="form-control" id="staffReopenedStatus">
<?php <?php
$statusesRS = hesk_dbQuery($openStatusesSql); foreach ($statuses as $key => $row)
while ($row = $statusesRS->fetch_assoc())
{ {
if ($row['IsClosed'] == 1) {
continue;
}
$selectedEcho = ($row['IsStaffReopenedStatus'] == 1) ? 'selected="selected"' : ''; $selectedEcho = ($row['IsStaffReopenedStatus'] == 1) ? 'selected="selected"' : '';
echo '<option value="'.$row['ID'].'" '.$selectedEcho.'>'.mfh_getDisplayTextForStatusId($row['ID']).'</option>'; echo '<option value="'.$row['ID'].'" '.$selectedEcho.'>'.mfh_getDisplayTextForStatusId($row['ID']).'</option>';
} }
@ -250,9 +269,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<select name="defaultStaffReplyStatus" class="form-control" id="defaultStaffReplyStatus"> <select name="defaultStaffReplyStatus" class="form-control" id="defaultStaffReplyStatus">
<?php <?php
$statusesRS = hesk_dbQuery($openStatusesSql); foreach ($statuses as $key => $row)
while ($row = $statusesRS->fetch_assoc())
{ {
if ($row['IsClosed'] == 1) {
continue;
}
$selectedEcho = ($row['IsDefaultStaffReplyStatus'] == 1) ? 'selected="selected"' : ''; $selectedEcho = ($row['IsDefaultStaffReplyStatus'] == 1) ? 'selected="selected"' : '';
echo '<option value="'.$row['ID'].'" '.$selectedEcho.'>'.mfh_getDisplayTextForStatusId($row['ID']).'</option>'; echo '<option value="'.$row['ID'].'" '.$selectedEcho.'>'.mfh_getDisplayTextForStatusId($row['ID']).'</option>';
} }
@ -265,8 +287,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<select name="lockedTicketStatus" class="form-control" id="lockedTicketStatus"> <select name="lockedTicketStatus" class="form-control" id="lockedTicketStatus">
<?php <?php
$statusesRS = hesk_dbQuery($statusesSql); foreach ($statuses as $key => $row)
while ($row = $statusesRS->fetch_assoc())
{ {
$selectedEcho = ($row['LockedTicketStatus'] == 1) ? 'selected="selected"' : ''; $selectedEcho = ($row['LockedTicketStatus'] == 1) ? 'selected="selected"' : '';
echo '<option value="'.$row['ID'].'" '.$selectedEcho.'>'.mfh_getDisplayTextForStatusId($row['ID']).'</option>'; echo '<option value="'.$row['ID'].'" '.$selectedEcho.'>'.mfh_getDisplayTextForStatusId($row['ID']).'</option>';
@ -280,9 +301,12 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
<div class="col-sm-6 col-xs-12"> <div class="col-sm-6 col-xs-12">
<select name="autocloseTicketOption" class="form-control" id="autocloseTicketOption"> <select name="autocloseTicketOption" class="form-control" id="autocloseTicketOption">
<?php <?php
$statusesRS = hesk_dbQuery($closedStatusesSql); foreach ($statuses as $key => $row)
while ($row = $statusesRS->fetch_assoc())
{ {
if ($row['IsClosed'] == 0) {
continue;
}
$selectedEcho = ($row['IsAutocloseOption'] == 1) ? 'selected' : ''; $selectedEcho = ($row['IsAutocloseOption'] == 1) ? 'selected' : '';
echo '<option value="'.$row['ID'].'" '.$selectedEcho.'>'.mfh_getDisplayTextForStatusId($row['ID']).'</option>'; echo '<option value="'.$row['ID'].'" '.$selectedEcho.'>'.mfh_getDisplayTextForStatusId($row['ID']).'</option>';
} }
@ -346,7 +370,11 @@ function buildConfirmDeleteModal($statusId) {
} }
function echoArrows($index, $numberOfStatuses, $statusId) { function echoArrows($index, $numberOfStatuses, $statusId) {
global $hesklang; global $hesklang, $modsForHesk_settings;
if ($modsForHesk_settings['statuses_order_column'] == 'name') {
return;
}
if ($index !== 1) { if ($index !== 1) {
// Display move up // Display move up

5
modsForHesk_settings.inc.php
Unescape Escape View File

@ -49,4 +49,7 @@ $modsForHesk_settings['show_number_merged'] = 1;
$modsForHesk_settings['request_location'] = 0; $modsForHesk_settings['request_location'] = 0;
//-- Column to sort categories by. Can be either 'name' or 'cat_order' //-- Column to sort categories by. Can be either 'name' or 'cat_order'
$modsForHesk_settings['category_order_column'] = 'cat_order'; $modsForHesk_settings['category_order_column'] = 'cat_order';
//-- Column to sort statuses by. Can be either 'sort' or 'name'
$modsForHesk_settings['statuses_order_column'] = 'sort';
Write Preview
Loading…
Cancel
Save