Merge pull request #12155 from frederic34/patch-14
Update html.formticket.class.php
This commit is contained in:
commit
c64a537bfd
@ -67,6 +67,7 @@ class FormTicket
|
||||
public $withsubstit;
|
||||
|
||||
public $withfile;
|
||||
public $withfilereadonly;
|
||||
|
||||
public $ispublic; // To show information or not into public form
|
||||
|
||||
@ -74,7 +75,7 @@ class FormTicket
|
||||
public $withcompany; // affiche liste déroulante company
|
||||
public $withfromsocid;
|
||||
public $withfromcontactid;
|
||||
public $withnotnotifytiersatcreate;
|
||||
public $withnotifytiersatcreate;
|
||||
public $withusercreate; // Show name of creating user in form
|
||||
public $withcreatereadonly;
|
||||
|
||||
@ -111,7 +112,7 @@ class FormTicket
|
||||
$this->withfromcontactid = 0;
|
||||
//$this->withthreadid=0;
|
||||
//$this->withtitletopic='';
|
||||
$this->withnotnotifytiersatcreate = 0;
|
||||
$this->withnotifytiersatcreate = 0;
|
||||
$this->withusercreate = 1;
|
||||
$this->withcreatereadonly = 1;
|
||||
$this->withemail = 0;
|
||||
@ -374,7 +375,7 @@ class FormTicket
|
||||
$listofmimes = explode(';', $_SESSION["listofmimes"]);
|
||||
}
|
||||
|
||||
$out .= '<tr>';
|
||||
$out = '<tr>';
|
||||
$out .= '<td width="180">' . $langs->trans("MailFile") . '</td>';
|
||||
$out .= '<td colspan="2">';
|
||||
// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
|
||||
@ -409,7 +410,8 @@ class FormTicket
|
||||
}
|
||||
|
||||
// Other attributes
|
||||
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $ticketstat, $action); // Note that $action and $object may have been modified by hook
|
||||
$parameters = array();
|
||||
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $ticketstat, $this->action); // Note that $action and $object may have been modified by hook
|
||||
if (empty($reshook))
|
||||
{
|
||||
print $ticketstat->showOptionals($extrafields, 'edit');
|
||||
@ -504,23 +506,18 @@ class FormTicket
|
||||
}
|
||||
|
||||
print '>';
|
||||
$value = ' ';
|
||||
if ($format == 0) {
|
||||
$value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
|
||||
}
|
||||
|
||||
if ($format == 1) {
|
||||
} elseif ($format == 1) {
|
||||
$value = $arraytypes['code'];
|
||||
}
|
||||
|
||||
if ($format == 2) {
|
||||
} elseif ($format == 2) {
|
||||
$value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
|
||||
}
|
||||
|
||||
if ($format == 3) {
|
||||
} elseif ($format == 3) {
|
||||
$value = $arraytypes['code'];
|
||||
}
|
||||
|
||||
print $value ? $value : ' ';
|
||||
print $value;
|
||||
print '</option>';
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user