diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 9573e8c5cb6..30664b90218 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -460,7 +460,7 @@ class FormTicket
// Type of Ticket
print '
'.$langs->trans("TicketTypeRequest").' ';
- $this->selectTypesTickets($type_code, 'type_code', '', 2, 1, 0, 0, 'minwidth200 maxwidth500');
+ $this->selectTypesTickets($type_code, 'type_code', '', 2, 'ifone', 0, 0, 'minwidth200 maxwidth500');
print ' ';
// Group => Category
@@ -469,12 +469,12 @@ class FormTicket
if ($public) {
$filter = '(public:=:1)';
}
- $this->selectGroupTickets($category_code, 'category_code', $filter, 2, 1, 0, 0, 'minwidth200 maxwidth500');
+ $this->selectGroupTickets($category_code, 'category_code', $filter, 2, 'ifone', 0, 0, 'minwidth200 maxwidth500');
print '';
// Severity => Priority
print ''.$langs->trans("TicketSeverity").' ';
- $this->selectSeveritiesTickets($severity_code, 'severity_code', '', 2, 1, 0, 0, 'minwidth200 maxwidth500');
+ $this->selectSeveritiesTickets($severity_code, 'severity_code', '', 2, 'ifone', 0, 0, 'minwidth200 maxwidth500');
print ' ';
if (isModEnabled('knowledgemanagement')) {
@@ -869,8 +869,8 @@ class FormTicket
* @param string|int[] $selected Id of preselected field or array of Ids
* @param string $htmlname Nom de la zone select
* @param string $filtertype To filter on field type in llx_c_ticket_type (array('code'=>xx,'label'=>zz))
- * @param int $format 0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code
- * @param int $empty 1=peut etre vide, 0 sinon
+ * @param int $format 0=id+label, 1=code+code, 2=code+label, 3=id+code
+ * @param int|string $empty 1 = can be empty or 'string' to show the string as the empty value, 0 = can't be empty, 'ifone' = can be empty but autoselected if there is one only
* @param int $noadmininfo 0=Add admin info, 1=Disable admin info
* @param int $maxlength Max length of label
* @param string $morecss More CSS
@@ -896,7 +896,7 @@ class FormTicket
print '';
if ($empty) {
- print ' ';
+ print ''.((is_numeric($empty) || $empty == 'ifone') ? ' ' : $empty).' ';
}
if (is_array($ticketstat->cache_types_tickets) && count($ticketstat->cache_types_tickets)) {
@@ -934,6 +934,8 @@ class FormTicket
print ' selected="selected"';
} elseif ($arraytypes['use_default'] == "1" && empty($selected)) {
print ' selected="selected"';
+ } elseif (count($ticketstat->cache_types_tickets) == 1 && (!$empty || $empty == 'ifone')) { // If only 1 choice, we autoselect it
+ print ' selected="selected"';
}
print '>';
@@ -992,10 +994,10 @@ class FormTicket
$ticketstat = new Ticket($this->db);
$ticketstat->loadCacheCategoriesTickets($publicgroups ? 1 : -1); // get list of active ticket groups
- if ($use_multilevel <= 0) {
+ if ($use_multilevel <= 0) { // Only one combo list to select the group of ticket (default)
print '';
if ($empty) {
- print ''.(is_numeric($empty) ? ' ' : $empty).' ';
+ print ''.((is_numeric($empty) || $empty == 'ifone') ? ' ' : $empty).' ';
}
if (is_array($ticketstat->cache_category_tickets) && count($ticketstat->cache_category_tickets)) {
@@ -1075,7 +1077,7 @@ class FormTicket
}
print ajax_combobox('select'.$htmlname);
- } elseif ($htmlname != '') {
+ } elseif ($htmlname != '') { // complexe mode using selection of group using a combo for each level (when using a hierarchy of groups).
$selectedgroups = array();
$groupvalue = "";
$groupticket = GETPOST($htmlname, 'aZ09');
@@ -1320,14 +1322,14 @@ class FormTicket
/**
* Return html list of ticket severitys (priorities)
*
- * @param string $selected Id severity pre-selected
- * @param string $htmlname Name of the select area
- * @param string $filtertype To filter on field type in llx_c_ticket_severity (array('code'=>xx,'label'=>zz))
- * @param int $format 0 = id+label, 1 = code+code, 2 = code+label, 3 = id+code
- * @param int $empty 1 = can be empty, 0 = or not
- * @param int $noadmininfo 0 = add admin info, 1 = disable admin info
- * @param int $maxlength Max length of label
- * @param string $morecss More CSS
+ * @param string $selected Id severity pre-selected
+ * @param string $htmlname Name of the select area
+ * @param string $filtertype To filter on field type in llx_c_ticket_severity (array('code'=>xx,'label'=>zz))
+ * @param int $format 0 = id+label, 1 = code+code, 2 = code+label, 3 = id+code
+ * @param int|string $empty 1 = can be empty or 'string' to show the string as the empty value, 0 = can't be empty, 'ifone' = can be empty but autoselected if there is one only
+ * @param int $noadmininfo 0 = add admin info, 1 = disable admin info
+ * @param int $maxlength Max length of label
+ * @param string $morecss More CSS
* @return void
*/
public function selectSeveritiesTickets($selected = '', $htmlname = 'ticketseverity', $filtertype = '', $format = 0, $empty = 0, $noadmininfo = 0, $maxlength = 0, $morecss = '')
@@ -1348,7 +1350,7 @@ class FormTicket
print '';
if ($empty) {
- print ' ';
+ print ''.((is_numeric($empty) || $empty == 'ifone') ? ' ' : $empty).' ';
}
if (is_array($conf->cache['severity_tickets']) && count($conf->cache['severity_tickets'])) {
@@ -1386,6 +1388,8 @@ class FormTicket
print ' selected="selected"';
} elseif ($arrayseverities['use_default'] == "1" && empty($selected)) {
print ' selected="selected"';
+ } elseif (count($conf->cache['severity_tickets']) == 1 && (!$empty || $empty == 'ifone')) { // If only 1 choice, we autoselect it
+ print ' selected="selected"';
}
print '>';