diff --git a/admin/manage_categories.php b/admin/manage_categories.php index 6f106775..2e2e48e0 100644 --- a/admin/manage_categories.php +++ b/admin/manage_categories.php @@ -62,8 +62,6 @@ if ($action = hesk_REQUEST('a')) { hesk_process_messages($hesklang['ddemo'], 'manage_categories.php', 'NOTICE'); } elseif ($action == 'new') { new_cat(); - } elseif ($action == 'rename') { - rename_cat(); } elseif ($action == 'remove') { remove(); } elseif ($action == 'order') { @@ -72,10 +70,8 @@ if ($action = hesk_REQUEST('a')) { toggle_autoassign(); } elseif ($action == 'type') { toggle_type(); - } elseif ($action == 'priority') { - change_priority(); - } elseif ($action == 'manager') { - change_manager(); + } elseif ($action == 'edit') { + update_category(); } } @@ -112,18 +108,12 @@ while ($mycat = hesk_dbFetchAssoc($res)) { ?>
- | - | - | - | - | - | - | - |
---|
+ | + | + | + | + | + | |
---|---|---|---|---|---|---|
' . $mycat['id'] . ' | -' . $mycat['name'] . ' | + $i = 1; + $j = 0; + $num = hesk_dbNumRows($res); + + while ($mycat = hesk_dbFetchAssoc($res)) { + $j++; + + if (isset($_SESSION['selcat2']) && $mycat['id'] == $_SESSION['selcat2']) { + $color = 'admin_green'; + unset($_SESSION['selcat2']); + } else { + $color = $i ? 'admin_white' : 'admin_gray'; + } + + $tmp = $i ? 'White' : 'Blue'; + $style = 'font-weight:normal;font-size:1em'; + if ($mycat['color'] == null) { + $style .= ';color: black'; + } else { + $style .= ';background: ' . $mycat['color']; + } + $i = $i ? 0 : 1; + + /* Number of tickets and graph width */ + $all = isset($tickets_all[$mycat['id']]) ? $tickets_all[$mycat['id']] : 0; + $width_all = 0; + if ($tickets_total && $all) { + $width_all = round(($all / $tickets_total) * 100); + } + + /* Deleting category with ID 1 (default category) is not allowed */ + if ($mycat['id'] == 1) { + $remove_code = ' '; + } else { + $remove_code = ' '; + } + + /* Is category private or public? */ + if ($mycat['type']) { + $type_code = ''; + } else { + $type_code = ''; + } + + /* Is auto assign enabled? */ + if ($hesk_settings['autoassign']) { + if ($mycat['autoassign']) { + $autoassign_code = ''; + } else { + $autoassign_code = ''; + } + } else { + $autoassign_code = ''; + } + + echo ' +|||||
' . $mycat['name'] . ' | ' . $priorities[$mycat['priority']]['formatted'] . ' | ' . $all . ' |
-
-
|
- ' . output_user_dropdown($mycat['id'], $mycat['manager'], $users) . ' | +' . get_manager($mycat['manager'], $users) . ' | ' . $autoassign_code . ' ' . $type_code . ' '; - if ($orderBy != 'name' && $num > 1) { - if ($j == 1) { - echo ' '; - } elseif ($j == $num) { - echo ' '; - } else { - echo ' + if ($orderBy != 'name' && $num > 1) { + if ($j == 1) { + echo ' '; + } elseif ($j == $num) { + echo ' '; + } else { + echo ' '; - } - } - - echo $remove_code . ' | + } + } + echo ''; + echo $remove_code . '
' . $user['name'] . '
'; + return '' . $user['name'] . '
'; } } - return '' . $hesklang['no_manager'] . '
'; + return '' . $hesklang['no_manager'] . '
'; } else { - $dropdownMarkup = '