lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12155 from frederic34/patch-14

Browse Source 
Update html.formticket.class.php
This commit is contained in:
Laurent Destailleur 2019-10-17 17:42:30 +02:00 committed by GitHub
commit c64a537bfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/core/class/html.formticket.class.php
View File

@ -67,6 +67,7 @@ class FormTicket
public $withsubstit; public $withsubstit;
public $withfile; public $withfile;
public $withfilereadonly;
public $ispublic; // To show information or not into public form public $ispublic; // To show information or not into public form
@ -74,7 +75,7 @@ class FormTicket
public $withcompany; // affiche liste déroulante company public $withcompany; // affiche liste déroulante company
public $withfromsocid; public $withfromsocid;
public $withfromcontactid; public $withfromcontactid;
public $withnotnotifytiersatcreate; public $withnotifytiersatcreate;
public $withusercreate; // Show name of creating user in form public $withusercreate; // Show name of creating user in form
public $withcreatereadonly; public $withcreatereadonly;
@ -111,7 +112,7 @@ class FormTicket
$this->withfromcontactid = 0; $this->withfromcontactid = 0;
//$this->withthreadid=0; //$this->withthreadid=0;
//$this->withtitletopic=''; //$this->withtitletopic='';
$this->withnotnotifytiersatcreate = 0; $this->withnotifytiersatcreate = 0;
$this->withusercreate = 1; $this->withusercreate = 1;
$this->withcreatereadonly = 1; $this->withcreatereadonly = 1;
$this->withemail = 0; $this->withemail = 0;
@ -374,7 +375,7 @@ class FormTicket
$listofmimes = explode(';', $_SESSION["listofmimes"]); $listofmimes = explode(';', $_SESSION["listofmimes"]);
} }
$out .= '<tr>'; $out = '<tr>';
$out .= '<td width="180">' . $langs->trans("MailFile") . '</td>'; $out .= '<td width="180">' . $langs->trans("MailFile") . '</td>';
$out .= '<td colspan="2">'; $out .= '<td colspan="2">';
// TODO Trick to have param removedfile containing nb of image to delete. But this does not works without javascript // 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 // 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)) if (empty($reshook))
{ {
print $ticketstat->showOptionals($extrafields, 'edit'); print $ticketstat->showOptionals($extrafields, 'edit');
@ -504,23 +506,18 @@ class FormTicket
} }
print '>'; print '>';
$value = '&nbsp;';
if ($format == 0) { if ($format == 0) {
$value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']); $value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
} } elseif ($format == 1) {
if ($format == 1) {
$value = $arraytypes['code']; $value = $arraytypes['code'];
} } elseif ($format == 2) {
if ($format == 2) {
$value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']); $value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
} } elseif ($format == 3) {
if ($format == 3) {
$value = $arraytypes['code']; $value = $arraytypes['code'];
} }
print $value ? $value : '&nbsp;'; print $value;
print '</option>'; print '</option>';
} }
} }