diff --git a/include/class.dynamic_forms.php b/include/class.dynamic_forms.php index 53f3760e028dae0ec2c39cfea43a75db68aa4ebb..be4f4af48565884d8d8c76775f0a57d8744ce0d4 100644 --- a/include/class.dynamic_forms.php +++ b/include/class.dynamic_forms.php @@ -698,7 +698,6 @@ class DynamicFormField extends VerySimpleModel { static function create($ht=false) { $inst = parent::create($ht); $inst->set('created', new SqlFunction('NOW')); - $inst->flags = self::FLAG_ENABLED; if (isset($ht['configuration'])) $inst->configuration = JsonDataEncoder::encode($ht['configuration']); return $inst; diff --git a/include/class.thread.php b/include/class.thread.php index e6bf896e016b856959a5d7498df95682b0dbf88e..3ee72e753fdb97bd68a85c3d0fcff7e91c195be1 100644 --- a/include/class.thread.php +++ b/include/class.thread.php @@ -515,7 +515,7 @@ Class ThreadEntry { } function getAttachments() { - return $this->attachments->getAll(true, false); + return $this->attachments->getAll(false); } function getAttachmentUrls($script='image.php') { diff --git a/include/class.ticket.php b/include/class.ticket.php index 067167f64b2393f507189e51b29203a691ac0227..64fb7dcb00cae7542ec497b54281e405951bd2fd 100644 --- a/include/class.ticket.php +++ b/include/class.ticket.php @@ -188,7 +188,7 @@ class Ticket { return false; $sql='SELECT ticket.*, thread.id as thread_id, lock_id, dept.name as dept_name ' - .' ,count(distinct attach.attach_id) as attachments' + .' ,count(distinct attach.id) as attachments' .' ,count(distinct task.id) as tasks' .' FROM '.TICKET_TABLE.' ticket ' .' LEFT JOIN '.DEPT_TABLE.' dept ON (ticket.dept_id=dept.id) ' diff --git a/include/i18n/en_US/form.yaml b/include/i18n/en_US/form.yaml index 577dd5539694eea2cf66a02b493e13d56aa50660..6e3d4c9e99e0df2309f129af394b292a11eb1f2c 100644 --- a/include/i18n/en_US/form.yaml +++ b/include/i18n/en_US/form.yaml @@ -97,7 +97,7 @@ type: priority # notrans name: priority # notrans label: Priority Level - flags: 0x430A3 + flags: 0x430B1 sort: 3 - type: C # notrans title: Company Information diff --git a/include/staff/templates/tickets.tmpl.php b/include/staff/templates/tickets.tmpl.php index ca1ff2b406ebdcd8a072f3aa543e7cac07cbb7c6..6e6b6cf5c383bfceaca595fa135c478b887bb862 100644 --- a/include/staff/templates/tickets.tmpl.php +++ b/include/staff/templates/tickets.tmpl.php @@ -145,7 +145,7 @@ if ($results) { ?> title="<?php echo __('Preview Ticket'); ?>" href="tickets.php?id=<?php echo $row['ticket_id']; ?>" data-preview="#tickets/<?php echo $row['ticket_id']; ?>/preview"><?php echo $tid; ?></a></td> - <td align="center" nowrap><?php echo Format::db_datetime($row['effective_date']); ?></td> + <td align="center" nowrap><?php echo Format::datetime($row['effective_date']); ?></td> <td><?php echo $status; ?></td> <td><a <?php if ($flag) { ?> class="Icon <?php echo $flag; ?>Ticket" title="<?php echo ucfirst($flag); ?> Ticket" <?php } ?> href="tickets.php?id=<?php echo $row['ticket_id']; ?>"><?php echo $subject; ?></a> diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php index 14ecb5759d51658d71317b28ae6e0ae6482466af..076f0e9adc34a54d30060e78947b54b4623ae338 100644 --- a/include/staff/tickets.inc.php +++ b/include/staff/tickets.inc.php @@ -309,7 +309,7 @@ $_SESSION[':Q:tickets'] = $tickets; href="tickets.php?id=<?php echo $T['ticket_id']; ?>" data-preview="#tickets/<?php echo $T['ticket_id']; ?>/preview" ><?php echo $tid; ?></a></td> - <td align="center" nowrap><?php echo Format::db_datetime($T[$date_col ?: 'lastupdate']); ?></td> + <td align="center" nowrap><?php echo Format::datetime($T[$date_col ?: 'lastupdate']); ?></td> <td><a <?php if ($flag) { ?> class="Icon <?php echo $flag; ?>Ticket" title="<?php echo ucfirst($flag); ?> Ticket" <?php } ?> href="tickets.php?id=<?php echo $T['ticket_id']; ?>"><?php echo $subject; ?></a> <?php