Changes the order of one of the columns and adjust some spacing.

This commit is contained in:
Mark Crane
2015-03-07 21:51:02 +00:00
parent e791288cd0
commit 52dfe82ae6
2 changed files with 3 additions and 3 deletions

View File

@@ -77,11 +77,11 @@ else {
} else {
$sql .= "where domain_uuid = '$domain_uuid' ";
if (strlen($search) > 0) {
$sql .= " and ";
$sql .= "and ";
}
}
if (strlen($search) > 0) {
$sql .= " (";
$sql .= "(";
$sql .= " destination_type like '%".$search."%' ";
$sql .= " or destination_number like '%".$search."%' ";
$sql .= " or destination_context like '%".$search."%' ";

View File

@@ -161,10 +161,10 @@ else {
echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr>\n";
echo th_order_by('device_mac_address', $text['label-device_mac_address'], $order_by, $order);
if ($_GET['showall'] && permission_exists('device_show_all')) {
echo th_order_by('domain_name', $text['label-domain-name'], $order_by, $order, $param);
}
echo th_order_by('device_mac_address', $text['label-device_mac_address'], $order_by, $order);
echo th_order_by('device_label', $text['label-device_label'], $order_by, $order);
echo th_order_by('device_vendor', $text['label-device_vendor'], $order_by, $order);
echo th_order_by('device_provision_enable', $text['label-device_provision_enable'], $order_by, $order);