[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15369] more on helpdesk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [15369] more on helpdesk |
|
Date: |
Mon, 25 Jul 2016 12:06:21 +0000 (UTC) |
Revision: 15369
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15369
Author: sigurdne
Date: 2016-07-25 12:06:21 +0000 (Mon, 25 Jul 2016)
Log Message:
-----------
more on helpdesk
Modified Paths:
--------------
trunk/helpdesk/inc/class.botts.inc.php
trunk/helpdesk/inc/class.menu.inc.php
trunk/helpdesk/inc/class.sotts.inc.php
trunk/helpdesk/inc/class.uitts.inc.php
trunk/helpdesk/setup/setup.inc.php
trunk/helpdesk/setup/tables_current.inc.php
Added Paths:
-----------
trunk/helpdesk/inc/hook_settings.inc.php
trunk/helpdesk/setup/phpgw_no.lang
trunk/helpdesk/setup/tables_update.inc.php
Modified: trunk/helpdesk/inc/class.botts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.botts.inc.php 2016-07-25 12:05:32 UTC (rev
15368)
+++ trunk/helpdesk/inc/class.botts.inc.php 2016-07-25 12:06:21 UTC (rev
15369)
@@ -125,7 +125,7 @@
$columns['assignedto'] = array
(
'id' => 'assignedto',
- 'name' => lang('assignedto')
+ 'name' => lang('assigned to')
);
$columns['billable_hours'] = array(
@@ -990,13 +990,68 @@
return $receipt;
}
- public function update_ticket($data, $id)
+ public function update_priority( $data, $id = 0 )
{
- $receipt = $this->so->update_ticket($data, $id);
- $this->fields_updated = $this->so->fields_updated;
+ $receipt = $this->so->update_priority($data, $id);
+ $this->fields_updated = $this->so->fields_updated;
return $receipt;
}
+ public function update_ticket( &$data, $id, $receipt = array(),
$values_attribute = array() )
+ {
+ if ($values_attribute && is_array($values_attribute))
+ {
+ $values_attribute =
$this->custom->convert_attribute_save($values_attribute);
+ }
+
+ $criteria = array
+ (
+ 'appname' => 'helpdesk',
+ 'location' => $this->acl_location,
+ 'allrows' => true
+ );
+
+ $custom_functions =
$GLOBALS['phpgw']->custom_functions->find($criteria);
+
+ foreach ($custom_functions as $entry)
+ {
+ // prevent path traversal
+ if (preg_match('/\.\./', $entry['file_name']))
+ {
+ continue;
+ }
+
+ $file = PHPGW_SERVER_ROOT .
"/helpdesk/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}/{$entry['file_name']}";
+ if ($entry['active'] && is_file($file) &&
!$entry['client_side'] && $entry['pre_commit'])
+ {
+ require $file;
+ }
+ }
+
+ $receipt = $this->so->update_ticket($data, $id,
$receipt, $values_attribute, $this->simple);
+ $this->fields_updated = $this->so->fields_updated;
+
+
+ reset($custom_functions);
+
+ foreach ($custom_functions as $entry)
+ {
+ // prevent path traversal
+ if (preg_match('/\.\./', $entry['file_name']))
+ {
+ continue;
+ }
+
+ $file = PHPGW_SERVER_ROOT .
"/helpdesk/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}/{$entry['file_name']}";
+ if ($entry['active'] && is_file($file) &&
!$entry['client_side'] && !$entry['pre_commit'])
+ {
+ require $file;
+ }
+ }
+
+ return $receipt;
+ }
+
public function get_reported_by( $selected = 0 )
{
$values = $this->so->get_reported_by();
Modified: trunk/helpdesk/inc/class.menu.inc.php
===================================================================
--- trunk/helpdesk/inc/class.menu.inc.php 2016-07-25 12:05:32 UTC (rev
15368)
+++ trunk/helpdesk/inc/class.menu.inc.php 2016-07-25 12:06:21 UTC (rev
15369)
@@ -116,7 +116,7 @@
$menus['navigation'] = array();
-
+/*
if ( $acl->check('.ticket',PHPGW_ACL_READ, 'helpdesk') )
{
$menus['navigation']['helpdesk'] = array
@@ -126,21 +126,7 @@
'image' =>
array('helpdesk', 'helpdesk')
);
}
-
- if ( $acl->check('.ticket.order',PHPGW_ACL_ADD,
'helpdesk') )
- {
- $menus['navigation']['helpdesk']['children'] =
array
- (
- 'order_template' => array
- (
- 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'property.uigeneric.index', 'type' => 'order_template') ),
- 'text' => lang('order
template'),
- 'image' =>
array('helpdesk', 'helpdesk')
- )
- );
- }
-
-
+*/
$GLOBALS['phpgw_info']['flags']['currentapp'] =
$incoming_app;
return $menus;
}
Modified: trunk/helpdesk/inc/class.sotts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.sotts.inc.php 2016-07-25 12:05:32 UTC (rev
15368)
+++ trunk/helpdesk/inc/class.sotts.inc.php 2016-07-25 12:06:21 UTC (rev
15369)
@@ -131,19 +131,14 @@
{
if( $order == 'assignedto' )
{
-// $result_order_field =
',account_lastname';
-// $order_join = "LEFT OUTER JOIN
phpgw_accounts ON phpgw_helpdesk_tickets.assignedto=phpgw_accounts.account_id";
-// $order = 'account_lastname';
+ $result_order_field =
',account_lastname';
+ $order = 'account_lastname';
}
else if( $order == 'user' )
{
$result_order_field =
',account_lastname';
$order = 'account_lastname';
}
- else
- {
- $order_join = '';
- }
$ordermethod = " ORDER BY $order $sort";
}
@@ -392,6 +387,7 @@
'cat_id'
=> $this->db->f('cat_id'),
'group_id'
=> $this->db->f('group_id'),
'entry_date'
=> $this->db->f('entry_date'),
+ 'modified_date'
=> $this->db->f('modified_date'),
'finnish_date'
=> $this->db->f('finnish_date'),
'finnish_date2'
=> $this->db->f('finnish_date2'),
'order_id'
=> $this->db->f('order_id'),
@@ -402,19 +398,6 @@
'billable_hours'
=> $this->db->f('billable_hours'),
);
}
-/*
- foreach ($tickets as &$ticket)
- {
- $this->db->query("SELECT count(*) as
hits FROM phpgw_helpdesk_views where id={$ticket['id']}"
- . " AND
account_id='{$this->account}'",__LINE__,__FILE__);
- $this->db->next_record();
-
- if(! $this->db->f('hits'))
- {
- $ticket['new_ticket'] = true;
- }
- }
- */
}
return $tickets;
@@ -485,6 +468,7 @@
$ticket['order_dim1'] =
$this->db->f('order_dim1');
$ticket['publish_note'] =
$this->db->f('publish_note');
$ticket['billable_hours'] =
$this->db->f('billable_hours');
+ $ticket['modified_date'] =
$this->db->f('modified_date');
$user_id=(int)$this->db->f('user_id');
@@ -571,6 +555,7 @@
$ticket['location_code'],
$address,
time(),
+ time(),
$ticket['finnish_date'],
$ticket['contact_id'],
1
@@ -581,7 +566,7 @@
$this->db->query("insert into phpgw_helpdesk_tickets
(priority,user_id,"
.
"assignedto,group_id,subject,cat_id,status,details,location_code,"
- .
"address,entry_date,finnish_date,contact_id,publish_note $cols)"
+ .
"address,entry_date,modified_date,finnish_date,contact_id,publish_note $cols)"
. "VALUES ($values $vals )",__LINE__,__FILE__);
$id =
$this->db->get_last_insert_id('phpgw_helpdesk_tickets','id');
@@ -700,6 +685,7 @@
if ($this->fields_updated)
{
+ $this->db->query('UPDATE phpgw_helpdesk_tickets
SET modified_date= ' . time() . " WHERE id={$id}", __LINE__, __FILE__);
$receipt['message'][]= array('msg' =>
lang('Ticket %1 has been updated',$id));
}
@@ -707,383 +693,426 @@
}
- function update_ticket($ticket,$id = 0)
+ function update_priority( $ticket, $id = 0 )
{
- $id = (int) $id;
+ $id = (int)$id;
$receipt = array();
+ $this->fields_updated = false;
+
+ $this->db->query("SELECT priority FROM
phpgw_helpdesk_tickets WHERE id={$id}", __LINE__, __FILE__);
+ $this->db->next_record();
+ $oldpriority = $this->db->f('priority');
+
+ $this->db->transaction_begin();
+
+ if ($oldpriority != $ticket['priority'])
+ {
+ $this->fields_updated = true;
+ $this->db->query("UPDATE phpgw_helpdesk_tickets
set priority='" . $ticket['priority']
+ . "' WHERE id={$id}", __LINE__,
__FILE__);
+ $this->historylog->add('P', $id,
$ticket['priority'], $oldpriority);
+ }
+
+ if ($this->fields_updated)
+ {
+ $this->db->query('UPDATE phpgw_helpdesk_tickets
SET modified_date= ' . time() . " WHERE id={$id}", __LINE__, __FILE__);
+ $receipt['message'][] = array('msg' =>
lang('Ticket %1 has been updated', $id));
+ }
+
+ $this->db->transaction_commit();
+
+ return $receipt;
+ }
+
+ function update_ticket( &$ticket, $id = 0, $receipt = array(),
$values_attribute = array(), $simple = false )
+ {
+ $this->fields_updated = array();
+ $id = (int)$id;
+ $ticket['id'] = $id;
// DB Content is fresher than http posted value.
- $this->db->query("select * from phpgw_helpdesk_tickets
where id='$id'",__LINE__,__FILE__);
+ $this->db->query("SELECT * FROM phpgw_helpdesk_tickets
WHERE id='$id'", __LINE__, __FILE__);
$this->db->next_record();
- $location_code = $this->db->f('location_code');
- $oldlocation_code = $this->db->f('location_code');
- $oldfinnish_date = $this->db->f('finnish_date');
- $oldfinnish_date2 = $this->db->f('finnish_date2');
- $oldassigned = $this->db->f('assignedto');
- $oldgroup_id = $this->db->f('group_id');
- $oldpriority = $this->db->f('priority');
- $oldcat_id =
$this->db->f('cat_id');
- $old_status = $this->db->f('status');
- $old_budget = $this->db->f('budget');
- $old_billable_hours =
$this->db->f('billable_hours');
+ $location_code = $this->db->f('location_code');
+ $oldlocation_code = $this->db->f('location_code');
+ $oldfinnish_date = $this->db->f('finnish_date');
+ $oldfinnish_date2 = $this->db->f('finnish_date2');
+ $oldassigned = $this->db->f('assignedto');
+ $oldgroup_id = $this->db->f('group_id');
+ $oldpriority = $this->db->f('priority');
+ $oldcat_id = $this->db->f('cat_id');
+ $old_status = $this->db->f('status');
+ $ticket['old_status'] = $old_status; // used for custom
functions
+ // $old_budget =
$this->db->f('budget');
+ $old_billable_hours =
(float)$this->db->f('billable_hours');
// $old_billable_rate =
$this->db->f('billable_rate');
- $old_subject = $this->db->f('subject');
- $old_contact_id = $this->db->f('contact_id');
- $old_actual_cost = $this->db->f('actual_cost');
- $old_order_cat_id = $this->db->f('order_cat_id');
- $old_building_part =
$this->db->f('building_part',true);
- $old_order_dim1 =
(int)$this->db->f('order_dim1');
+ $old_subject = $this->db->f('subject');
+ $old_contact_id = $this->db->f('contact_id');
+ $old_order_cat_id = $this->db->f('order_cat_id');
+ $old_building_part = $this->db->f('building_part',
true);
+ $old_order_dim1 = (int)$this->db->f('order_dim1');
- if($oldcat_id ==0){$oldcat_id ='';}
- if($old_order_cat_id ==0){$old_order_cat_id ='';}
- if($oldassigned ==0){$oldassigned ='';}
- if($oldgroup_id ==0){$oldgroup_id ='';}
+ if ($oldcat_id == 0)
+ {
+ $oldcat_id = '';
+ }
+ if ($old_order_cat_id == 0)
+ {
+ $old_order_cat_id = '';
+ }
+ if ($oldassigned == 0)
+ {
+ $oldassigned = '';
+ }
+ if ($oldgroup_id == 0)
+ {
+ $oldgroup_id = '';
+ }
- // Figure out and last note
+ // Figure out and last note
- $history_values =
$this->historylog->return_array(array(),array('C'),'history_timestamp','DESC',$id);
+ $history_values =
$this->historylog->return_array(array(), array('C'), 'history_timestamp',
'DESC', $id);
$old_note = $history_values[0]['new_value'];
- if(!$old_note)
+ if (!$old_note)
{
$old_note = $this->db->f('details');
}
-
$this->db->transaction_begin();
/*
- ** phpgw_phpgw_helpdesk_append.append_type - Defs
- ** R - Reopen ticket
- ** X - Ticket closed
- ** O - Ticket opened
- ** C - Comment appended
- ** A - Ticket assignment
- ** G - Ticket group assignment
- ** P - Priority change
- ** T - Category change
- ** S - Subject change
- ** B - Budget change
- ** H - Billing hours
- ** F - finnish date
- ** C% - Status change
- ** L - Location changed
- ** M - Mail sent to vendor
+ * * phpgw_fm_tts_append.append_type - Defs
+ * * R - Reopen ticket
+ * * X - Ticket closed
+ * * O - Ticket opened
+ * * C - Comment appended
+ * * A - Ticket assignment
+ * * G - Ticket group assignment
+ * * P - Priority change
+ * * T - Category change
+ * * S - Subject change
+ * * B - Budget change
+ * * AC - actual cost changed
+ * * H - Billing hours
+ * * F - finnish date
+ * * C% - Status change
+ * * L - Location changed
+ * * M - Mail sent to vendor
*/
- $this->db->query("UPDATE phpgw_helpdesk_tickets SET
publish_note = NULL WHERE id = {$id}",__LINE__,__FILE__);
- $this->db->query("UPDATE phpgw_history_log SET publish
= NULL WHERE history_record_id = {$id}",__LINE__,__FILE__);
- if(isset($ticket['publish_note']))
+ if (!$simple)
{
- foreach ($ticket['publish_note'] as
$publish_info)
+ $this->db->query("UPDATE phpgw_helpdesk_tickets
SET publish_note = NULL WHERE id = {$id}", __LINE__, __FILE__);
+ $this->db->query("UPDATE phpgw_history_log SET
publish = NULL WHERE history_record_id = {$id}", __LINE__, __FILE__);
+ if (isset($ticket['publish_note']))
{
- $note = explode('_', $publish_info);
- if(!$note[1])
+ foreach ($ticket['publish_note'] as
$publish_info)
{
- $this->db->query("UPDATE
phpgw_helpdesk_tickets SET publish_note = 1 WHERE id =
{$note[0]}",__LINE__,__FILE__);
+ $note = explode('_',
$publish_info);
+ if (!$note[1])
+ {
+
$this->db->query("UPDATE phpgw_helpdesk_tickets SET publish_note = 1 WHERE id =
{$note[0]}", __LINE__, __FILE__);
+ }
+ else
+ {
+
$this->db->query("UPDATE phpgw_history_log SET publish = 1 WHERE history_id =
{$note[1]}", __LINE__, __FILE__);
+ }
}
- else
- {
- $this->db->query("UPDATE
phpgw_history_log SET publish = 1 WHERE history_id =
{$note[1]}",__LINE__,__FILE__);
- }
}
}
- $finnish_date = (isset($ticket['finnish_date']) ?
phpgwapi_datetime::date_to_timestamp($ticket['finnish_date']):'');
+ if (($old_note != $ticket['note']) && $ticket['note'])
+ {
+ $this->fields_updated[] = 'note';
+ $this->historylog->add('C', $id,
$ticket['note'], $old_note);
+ $_history_id =
$this->db->get_last_insert_id('phpgw_history_log', 'history_id');
+ $this->db->query("UPDATE phpgw_history_log SET
publish = 1 WHERE history_id = $_history_id", __LINE__, __FILE__);
+ unset($_history_id);
+ }
+ if (isset($this->fields_updated) &&
$this->fields_updated && $simple)
+ {
+ $receipt['message'][] = array('msg' =>
lang('Ticket1 has been updated'));
+ $this->db->transaction_commit();
+ return $receipt;
+ }
+
+ $finnish_date = (isset($ticket['finnish_date']) ?
phpgwapi_datetime::date_to_timestamp($ticket['finnish_date']) : '');
+
if ($oldfinnish_date && isset($ticket['finnish_date'])
&& $ticket['finnish_date'])
{
$this->db->query("update phpgw_helpdesk_tickets
set finnish_date2='" . $finnish_date
- . "' where id='$id'",__LINE__,__FILE__);
+ . "' where id='$id'", __LINE__,
__FILE__);
}
- else if(!$oldfinnish_date &&
isset($ticket['finnish_date']) && $ticket['finnish_date'])
+ else if (!$oldfinnish_date &&
isset($ticket['finnish_date']) && $ticket['finnish_date'])
{
$this->db->query("update phpgw_helpdesk_tickets
set finnish_date='" . $finnish_date
- . "' where id='$id'",__LINE__,__FILE__);
+ . "' where id='$id'", __LINE__,
__FILE__);
}
- if($oldfinnish_date2>0)
+ if ($oldfinnish_date2 > 0)
{
$oldfinnish_date = $oldfinnish_date2;
}
- if(isset($ticket['finnish_date']) &&
$ticket['finnish_date'])
+ if (isset($ticket['finnish_date']) &&
$ticket['finnish_date'])
{
if ($oldfinnish_date != $finnish_date)
{
- $this->fields_updated = true;
-
$this->historylog->add('F',$id,$finnish_date,$oldfinnish_date);
+ $this->fields_updated[] =
'finnish_date';
+ $this->historylog->add('F', $id,
$finnish_date, $oldfinnish_date);
}
}
if (isset($ticket['status']) && ($old_status !=
$ticket['status']))
{
- $check_old_custom = (int) trim($old_status,'C');
- $this->db->query("SELECT * from
phpgw_helpdesk_status WHERE id = {$check_old_custom}",__LINE__,__FILE__);
+ $check_old_custom = (int)trim($old_status, 'C');
+ $this->db->query("SELECT * from
phpgw_helpdesk_status WHERE id = {$check_old_custom}", __LINE__, __FILE__);
$this->db->next_record();
- $this->fields_updated = true;
- if($old_status=='X' || $this->db->f('closed'))
+ $old_closed = $this->db->f('closed');
+ $this->fields_updated[] = 'status';
+ if ($old_status == 'X' || $old_closed)
{
$new_status = $ticket['status'];
-
$this->historylog->add('R',$id,$ticket['status'],$old_status);
+ $this->historylog->add('R', $id,
$ticket['status'], $old_status);
- $this->db->query("UPDATE
phpgw_helpdesk_tickets SET status='{$new_status}' WHERE id=
{$id}",__LINE__,__FILE__);
+ $this->db->query("UPDATE
phpgw_helpdesk_tickets SET status='{$new_status}' WHERE id= {$id}", __LINE__,
__FILE__);
}
else
{
-
$this->historylog->add($ticket['status'],$id,$ticket['status'],$old_status);
- $this->db->query("UPDATE
phpgw_helpdesk_tickets SET status='{$ticket['status']}' WHERE
id={$id}",__LINE__,__FILE__);
+
$this->historylog->add($ticket['status'], $id, $ticket['status'], $old_status);
+ $this->db->query("UPDATE
phpgw_helpdesk_tickets SET status='{$ticket['status']}' WHERE id={$id}",
__LINE__, __FILE__);
}
$this->check_pending_action($ticket, $id);
+
+ //Close cases at related
+ $check_new_custom =
(int)trim($ticket['status'], 'C');
+ $this->db->query("SELECT closed from
phpgw_helpdesk_status WHERE id = {$check_new_custom}", __LINE__, __FILE__);
+ $this->db->next_record();
+
+ if (($this->db->f('closed') ||
$ticket['status'] == 'X') && ($old_status != 'X' && !$old_closed))
+ {
+ $location_id =
$GLOBALS['phpgw']->locations->get_id('helpdesk', '.ticket');
+ // at controller
+ if
(isset($GLOBALS['phpgw_info']['user']['apps']['controller']))
+ {
+ $controller =
CreateObject('controller.uicase');
+
$controller->updateStatusForCases($location_id, $id, 1);
+ }
+ // at request
+
execMethod('property.sorequest.update_status_from_related', array(
+ 'location_id' => $location_id,
+ 'id' => $id,
+ 'status' => 'closed')
+ );
+ }
}
- if (($oldassigned != $ticket['assignedto']) &&
$ticket['assignedto'] != 'ignore')
+ if ($ticket['assignedto'] && ( ($oldassigned !=
$ticket['assignedto']) && $ticket['assignedto'] != 'ignore'))
{
- $this->fields_updated = true;
+ $this->fields_updated[] = 'assignedto';
- $value_set=array('assignedto' =>
$ticket['assignedto']);
- $value_set =
$this->db->validate_update($value_set);
+ $value_set = array('assignedto' =>
$ticket['assignedto']);
+ $value_set =
$this->db->validate_update($value_set);
- $this->db->query("update phpgw_helpdesk_tickets
set $value_set where id='$id'",__LINE__,__FILE__);
-
$this->historylog->add('A',$id,$ticket['assignedto'],$oldassigned);
+ $this->db->query("update phpgw_helpdesk_tickets
set $value_set where id='$id'", __LINE__, __FILE__);
+ $this->historylog->add('A', $id,
$ticket['assignedto'], $oldassigned);
}
if (($oldgroup_id != $ticket['group_id']) &&
$ticket['group_id'] != 'ignore')
{
- $this->fields_updated = true;
+ $this->fields_updated[] = 'group_id';
- $value_set=array('group_id' =>
$ticket['group_id']);
- $value_set =
$this->db->validate_update($value_set);
+ $value_set = array('group_id' =>
$ticket['group_id']);
+ $value_set =
$this->db->validate_update($value_set);
- $this->db->query("update phpgw_helpdesk_tickets
set $value_set where id='$id'",__LINE__,__FILE__);
-
$this->historylog->add('G',$id,$ticket['group_id'],$oldgroup_id);
+ $this->db->query("update phpgw_helpdesk_tickets
set $value_set where id='$id'", __LINE__, __FILE__);
+ $this->historylog->add('G', $id,
$ticket['group_id'], $oldgroup_id);
}
if ($oldpriority != $ticket['priority'])
{
- $this->fields_updated = true;
+ $this->fields_updated[] = 'priority';
$this->db->query("update phpgw_helpdesk_tickets
set priority='" . $ticket['priority']
- . "' where id='$id'",__LINE__,__FILE__);
-
$this->historylog->add('P',$id,$ticket['priority'],$oldpriority);
+ . "' where id='$id'", __LINE__,
__FILE__);
+ $this->historylog->add('P', $id,
$ticket['priority'], $oldpriority);
}
if ($old_contact_id != $ticket['contact_id'])
{
- $contact_id = (int) $ticket['contact_id'];
- $this->fields_updated = true;
- $this->db->query("update phpgw_helpdesk_tickets
set contact_id={$contact_id} WHERE id=$id",__LINE__,__FILE__);
+ $contact_id = (int)$ticket['contact_id'];
+ $this->fields_updated[] = 'contact_id';
+ $this->db->query("update phpgw_helpdesk_tickets
set contact_id={$contact_id} WHERE id=$id", __LINE__, __FILE__);
}
- if (($oldcat_id != $ticket['cat_id']) &&
$ticket['cat_id'] != 'ignore')
+ if ($ticket['cat_id'] && ( ($oldcat_id !=
$ticket['cat_id']) && $ticket['cat_id'] != 'ignore'))
{
- $this->fields_updated = true;
+ $this->fields_updated[] = 'cat_id';
$this->db->query("update phpgw_helpdesk_tickets
set cat_id='" . $ticket['cat_id']
- . "' where id='$id'",__LINE__,__FILE__);
-
$this->historylog->add('T',$id,$ticket['cat_id'],$oldcat_id);
+ . "' where id='$id'", __LINE__,
__FILE__);
+ $this->historylog->add('T', $id,
$ticket['cat_id'], $oldcat_id);
}
- if ($old_budget != $ticket['budget'])
- {
- $this->fields_updated = true;
- $this->db->query("UPDATE phpgw_helpdesk_tickets
set budget='" . (int)$ticket['budget']
- . "' where id='$id'",__LINE__,__FILE__);
-
$this->historylog->add('B',$id,$ticket['budget'],$old_budget);
- }
- /*
- if ($old_billable_rate != $ticket['billable_rate'])
- {
- $this->fields_updated = true;
- $this->db->query("update phpgw_helpdesk_tickets
set billable_rate='" . $ticket['billable_rate']
- . "' where id='$id'",__LINE__,__FILE__);
-
$this->historylog->add('B',$id,$ticket['billable_rate'],$old_billable_rate);
- }
- */
+ /*
+ if ($old_billable_rate != $ticket['billable_rate'])
+ {
+ $this->fields_updated[] = 'billable_rate';
+ $this->db->query("update phpgw_helpdesk_tickets set
billable_rate='" . $ticket['billable_rate']
+ . "' where id='$id'",__LINE__,__FILE__);
+
$this->historylog->add('B',$id,$ticket['billable_rate'],$old_billable_rate);
+ }
+ */
if ($old_subject != $ticket['subject'])
{
$this->db->query("UPDATE phpgw_helpdesk_tickets
SET subject='" . $ticket['subject']
- . "' where id='$id'",__LINE__,__FILE__);
-
$this->historylog->add('S',$id,$ticket['subject'],$old_subject);
- $receipt['message'][]= array('msg' =>
lang('Subject has been updated'));
+ . "' where id='$id'", __LINE__,
__FILE__);
+ $this->historylog->add('S', $id,
$ticket['subject'], $old_subject);
+ $receipt['message'][] = array('msg' =>
lang('Subject has been updated'));
}
- if($ticket['billable_hours'])
+ if ($ticket['billable_hours'])
{
- $ticket['billable_hours'] =
str_replace(',','.', $ticket['billable_hours']);
- }
- if ((float)$old_billable_hours !=
(float)$ticket['billable_hours'])
- {
+ $ticket['billable_hours'] =
(float)str_replace(',', '.', $ticket['billable_hours']);
+ $ticket['billable_hours'] +=
(float)$old_billable_hours;
+// }
+// if ((float)$old_billable_hours !=
$ticket['billable_hours'])
+// {
$this->db->query("UPDATE phpgw_helpdesk_tickets
SET billable_hours='{$ticket['billable_hours']}'"
- . " WHERE
id='{$id}'",__LINE__,__FILE__);
-
$this->historylog->add('H',$id,$ticket['billable_hours'],$old_billable_hours);
- $receipt['message'][]= array('msg' =>
lang('billable hours has been updated'));
+ . " WHERE id='{$id}'", __LINE__,
__FILE__);
+ $this->historylog->add('H', $id,
$ticket['billable_hours'], $old_billable_hours);
+ $receipt['message'][] = array('msg' =>
lang('billable hours has been updated'));
}
- if ((int)$old_actual_cost !=
(int)$ticket['actual_cost'])
+ if (isset($ticket['location']) && $ticket['location'])
{
- $this->db->query("UPDATE phpgw_helpdesk_tickets
SET actual_cost='" . (float)$ticket['actual_cost']
- . "' WHERE id='$id'",__LINE__,__FILE__);
-
$this->historylog->add('AC',$id,(float)$ticket['actual_cost'] ,
$old_actual_cost);
- $receipt['message'][]= array('msg' =>
lang('actual_cost has been updated'));
- }
-
- if ((int)$old_order_cat_id !=
(int)$ticket['order_cat_id'])
- {
- $this->db->query("UPDATE phpgw_helpdesk_tickets
SET order_cat_id='" . (int)$ticket['order_cat_id']
- . "' WHERE id='$id'",__LINE__,__FILE__);
- $receipt['message'][]= array('msg' =>
lang('order category has been updated'));
- $this->fields_updated = true;
- }
-
- if ((int)$old_order_dim1 != (int)$ticket['order_dim1'])
- {
- $this->db->query("UPDATE phpgw_helpdesk_tickets
SET order_dim1='" . (int)$ticket['order_dim1']
- . "' WHERE id='$id'",__LINE__,__FILE__);
- $receipt['message'][]= array('msg' =>
lang('order_dim1 has been updated'));
- $this->fields_updated = true;
- }
-
- if ($old_building_part != $ticket['building_part'])
- {
- $this->db->query("UPDATE phpgw_helpdesk_tickets
SET building_part='" . $ticket['building_part']
- . "' WHERE id='$id'",__LINE__,__FILE__);
- $receipt['message'][]= array('msg' =>
lang('building part has been updated'));
- $this->fields_updated = true;
- }
-
- if (($old_note != $ticket['note']) && $ticket['note'])
- {
- $this->fields_updated = true;
-
$this->historylog->add('C',$id,$ticket['note'],$old_note);
- $_history_id =
$this->db->get_last_insert_id('phpgw_history_log','history_id');
- $this->db->query("UPDATE phpgw_history_log SET
publish = 1 WHERE history_id = $_history_id",__LINE__,__FILE__);
- unset($_history_id);
- }
-
- if(isset($ticket['location']) && $ticket['location'])
- {
$ticket['location_code'] = implode('-',
$ticket['location']);
}
if (isset($ticket['location_code']) &&
$ticket['location_code'] && ($oldlocation_code != $ticket['location_code']))
{
- $interlink =
CreateObject('helpdesk.interlink');
- if( $interlink->get_relation('helpdesk',
'.ticket', $id, 'origin') || $interlink->get_relation('helpdesk', '.ticket',
$id, 'target'))
+ $interlink = CreateObject('property.interlink');
+ if ($interlink->get_relation('helpdesk',
'.ticket', $id, 'origin') || $interlink->get_relation('helpdesk', '.ticket',
$id, 'target'))
{
- $receipt['message'][]= array('msg' =>
lang('location could not be changed'));
+ $receipt['message'][] = array('msg' =>
lang('location could not be changed'));
}
else
{
- $value_set = array();
+ $value_set = array();
- if(isset($ticket['street_name']) &&
$ticket['street_name'])
+ $_address = array();
+ if (isset($ticket['street_name']) &&
$ticket['street_name'])
{
- $address[]=
$ticket['street_name'];
- $address[]=
$ticket['street_number'];
- $value_set['address'] =
$this->db->db_addslashes(implode(" ", $address));
+ $_address[] =
"{$ticket['street_name']} {$ticket['street_number']}";
}
- if(!isset($address) || !$address)
+ if (isset($ticket['location_name']) &&
$ticket['location_name'])
{
- $address =
isset($ticket['location_name']) ?
$this->db->db_addslashes($ticket['location_name']) : '';
- if($address)
+ $_address[] =
$ticket['location_name'];
+ }
+
+ if (isset($ticket['additional_info'])
&& $ticket['additional_info'])
+ {
+ foreach
($ticket['additional_info'] as $key => $value)
{
- $value_set['address'] =
$address;
+ if ($value)
+ {
+ $_address[] =
"{$key}|{$value}";
+ }
}
}
+
+ if (isset($ticket['extra']['p_num']) &&
$ticket['extra']['p_num'] && $ticket['extra']['p_entity_id'] &&
$ticket['extra']['p_cat_id'])
+ {
+ $entity =
CreateObject('property.soadmin_entity');
+ $entity_category =
$entity->read_single_category($ticket['extra']['p_entity_id'],
$ticket['extra']['p_cat_id']);
+ }
+
+ if (isset($entity_category) &&
$entity_category)
+ {
+ $_address[] =
"{$entity_category['name']}::{$ticket['extra']['p_num']}";
+ }
+
+ $address =
$this->db->db_addslashes(implode('::', $_address));
+
+ unset($_address);
+
+ $value_set['address'] = $address;
+
if (isset($ticket['location_code']) &&
$ticket['location_code'])
{
$value_set['location_code'] =
$ticket['location_code'];
}
- $admin_location =
CreateObject('helpdesk.soadmin_location');
+ $admin_location =
CreateObject('property.soadmin_location');
$admin_location->read(false);
// Delete old values for location - in
case of moving up in the hierarchy
$metadata =
$this->db->metadata('phpgw_helpdesk_tickets');
- for ($i = 1;$i <
$admin_location->total_records + 1; $i++)
+ for ($i = 1; $i <
$admin_location->total_records + 1; $i++)
{
- if(isset($metadata["loc{$i}"]))
+ if (isset($metadata["loc{$i}"]))
{
- $value_set["loc{$i}"]
= false;
+ $value_set["loc{$i}"] =
false;
}
}
- if(isset($ticket['location']) &&
is_array($ticket['location']))
+ if (isset($ticket['location']) &&
is_array($ticket['location']))
{
foreach ($ticket['location'] as
$column => $value)
{
- $value_set[$column]
= $value;
+ $value_set[$column] =
$value;
}
}
- if(isset($ticket['extra']) &&
is_array($ticket['extra']))
- {
- foreach ($ticket['extra'] as
$column => $value)
- {
- $value_set[$column]
= $value;
- }
- }
- $value_set =
$this->db->validate_update($value_set);
+ $value_set =
$this->db->validate_update($value_set);
- $this->db->query("UPDATE
phpgw_helpdesk_tickets SET $value_set WHERE id={$id}",__LINE__,__FILE__);
+ $this->db->query("UPDATE
phpgw_helpdesk_tickets SET $value_set WHERE id={$id}", __LINE__, __FILE__);
-
$this->historylog->add('L',$id,$ticket['location_code'],$oldlocation_code);
- $receipt['message'][]= array('msg' =>
lang('Location has been updated'));
+ $this->historylog->add('L', $id,
$ticket['location_code'], $oldlocation_code);
+ $receipt['message'][] = array('msg' =>
lang('Location has been updated'));
}
unset($interlink);
}
+ $value_set = array();
- if(isset($ticket['make_order']) &&
$ticket['make_order'])
+ $data_attribute =
$this->custom->prepare_for_db('phpgw_helpdesk_tickets', $values_attribute);
+
+ if (isset($data_attribute['value_set']))
{
- $order_id =
execMethod('property.socommon.increment_id', 'helpdesk');
- if($order_id)
+ foreach ($data_attribute['value_set'] as
$input_name => $value)
{
- $this->db->query("UPDATE
phpgw_helpdesk_tickets SET order_id = {$order_id} WHERE
id={$id}",__LINE__,__FILE__);
- $this->db->query("INSERT INTO fm_orders
(id, type) VALUES ({$order_id}, 'helpdesk')",__LINE__,__FILE__);
+ $value_set[$input_name] = $value;
}
}
- $value_set =
array();
- $value_set['vendor_id'] = $ticket['vendor_id'];
- $value_set['b_account_id'] =
$ticket['b_account_id'];
- $value_set['order_descr'] =
$this->db->db_addslashes($ticket['order_descr']);
- $value_set['ecodimb'] = $ticket['ecodimb'];
- $value_set['budget'] = $ticket['budget'];
- $value_set =
$this->db->validate_update($value_set);
- $this->db->query("UPDATE phpgw_helpdesk_tickets SET
$value_set WHERE id={$id}",__LINE__,__FILE__);
+ $value_set['modified_date'] = time();
- $this->db->transaction_commit();
+ $value_set = $this->db->validate_update($value_set);
+ $this->db->query("UPDATE phpgw_helpdesk_tickets SET
$value_set WHERE id={$id}", __LINE__, __FILE__);
- if (isset($this->fields_updated))
+ $value_set = array();
+
+ if (isset($ticket['extra']) &&
is_array($ticket['extra']) && $ticket['extra'])
{
- $receipt['message'][]= array('msg' =>
lang('Ticket has been updated'));
+ foreach ($ticket['extra'] as $column => $value)
+ {
+ $value_set[$column] = $value;
+ }
- $criteria = array
- (
- 'appname' => 'helpdesk',
- 'location' =>
$this->acl_location,
- 'allrows' => true
- );
+ $value_set =
$this->db->validate_update($value_set);
- $custom_functions =
$GLOBALS['phpgw']->custom_functions->find($criteria);
+ $this->db->query("UPDATE phpgw_helpdesk_tickets
SET $value_set WHERE id={$id}", __LINE__, __FILE__);
+ }
- foreach ( $custom_functions as $entry )
- {
- // prevent path traversal
- if ( preg_match('/\.\./',
$entry['file_name']) )
- {
- continue;
- }
+ $this->db->transaction_commit();
- $file = PHPGW_SERVER_ROOT .
"/helpdesk/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}/{$entry['file_name']}";
- if ( $entry['active'] && is_file($file)
)
- {
- require_once $file;
- }
- }
+ if (isset($this->fields_updated) &&
$this->fields_updated)
+ {
+ $receipt['message'][] = array('msg' =>
lang('Ticket has been updated'));
}
return $receipt;
}
@@ -1152,7 +1181,7 @@
$this->db->query("DELETE FROM fm_action_pending WHERE
location_id = {$location_id} AND item_id = {$id}",__LINE__,__FILE__);
$this->db->query("DELETE FROM phpgw_interlink WHERE
location1_id = {$location_id} AND location1_item_id = {$id}",__LINE__,__FILE__);
$this->db->query("DELETE FROM phpgw_interlink WHERE
location2_id = {$location_id} AND location2_item_id = {$id}",__LINE__,__FILE__);
- $this->db->query("DELETE FROM phpgw_helpdesk_history
WHERE history_record_id = {$id}",__LINE__,__FILE__);
+ $this->db->query("DELETE FROM phpgw_history_log WHERE
history_record_id = {$id}",__LINE__,__FILE__);
$this->db->query("DELETE FROM phpgw_helpdesk_views
WHERE id = {$id}",__LINE__,__FILE__);
$this->db->query("DELETE FROM phpgw_helpdesk_tickets
WHERE id = {$id}",__LINE__,__FILE__);
Modified: trunk/helpdesk/inc/class.uitts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.uitts.inc.php 2016-07-25 12:05:32 UTC (rev
15368)
+++ trunk/helpdesk/inc/class.uitts.inc.php 2016-07-25 12:06:21 UTC (rev
15369)
@@ -45,6 +45,7 @@
'download' => true,
'view_file' => true,
'edit_status' => true,
+ 'edit_priority' => true,
'get_vendor_email' => true,
'_print' => true,
'columns' => true,
@@ -357,6 +358,28 @@
return "id ".$id." ".lang('Status has been changed');
}
+ function edit_priority()
+ {
+ if (!$this->acl_edit)
+ {
+ return lang('sorry - insufficient rights');
+ }
+
+ $new_priority = phpgw::get_var('new_priority', 'int');
+ $id = phpgw::get_var('id', 'int');
+
+// $ticket = $this->bo->read_single($id);
+
+ $receipt = $this->bo->update_priority(array('priority'
=> $new_priority), $id);
+ if
((isset($this->bo->config->config_data['mailnotification']) &&
$this->bo->config->config_data['mailnotification']) ||
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_notify_me'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['tts_notify_me']
== 1 && $this->bo->fields_updated
+ )
+ )
+ {
+ $receipt = $this->bo->mail_ticket($id,
$this->bo->fields_updated, $receipt);
+ }
+ return "id {$id} " . lang('priority has been changed');
+ }
+
function delete()
{
if(!$this->acl_delete)
@@ -448,7 +471,7 @@
$uicols['name'][] = 'link_view';
$uicols['descr'][] = lang('link view');
$uicols['name'][] = 'lang_view_statustext';
- $uicols['descr'][] = lang('lang view statustext');
+ $uicols['descr'][] = lang('view statustext');
$uicols['name'][] = 'text_view';
$uicols['descr'][] = lang('text view');
Added: trunk/helpdesk/inc/hook_settings.inc.php
===================================================================
--- trunk/helpdesk/inc/hook_settings.inc.php (rev 0)
+++ trunk/helpdesk/inc/hook_settings.inc.php 2016-07-25 12:06:21 UTC (rev
15369)
@@ -0,0 +1,108 @@
+<?php
+ /**
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2003,2004,2005,2006,2007 Free Software
Foundation, Inc. http://www.fsf.org/
+ * This file is part of phpGroupWare.
+ *
+ * phpGroupWare is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * phpGroupWare is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with phpGroupWare; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
+ *
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
+ * @package helpdesk
+ * @subpackage core
+ * @version $Id: hook_settings.inc.php 14969 2016-05-04 08:19:06Z
sigurdne $
+ */
+
+ $yes_and_no = array(
+ 'yes' => 'Yes',
+ 'no' => 'No'
+ );
+
+
+ $status_list_tts = execMethod('helpdesk.botts._get_status_list');
+
+ if ($status_list_tts)
+ {
+ foreach ($status_list_tts as $entry)
+ {
+ $_status_tts[$entry['id']] = $entry['name'];
+ }
+ }
+
+ create_select_box('show quick link for changing status for tickets',
'tts_status_link', $yes_and_no, 'Enables to set status wihout entering the
ticket');
+
+ $acc = & $GLOBALS['phpgw']->accounts;
+ $group_list = $acc->get_list('groups');
+ foreach ($group_list as $entry)
+ {
+ $_groups[$entry->id] = $entry->lid;
+ }
+ create_select_box('Default group TTS', 'groupdefault', $_groups, 'The
default group to assign a ticket in Helpdesk-submodule');
+
+ $account_list = $acc->get_list('accounts', -1, 'ASC',
'account_lastname');
+
+ foreach ($account_list as $entry)
+ {
+ if ($entry->enabled == true)
+ {
+ $_accounts[$entry->id] = $entry->__toString();
+ }
+ }
+ create_select_box('Default assign to TTS', 'assigntodefault',
$_accounts, 'The default user to assign a ticket in Helpdesk-submodule');
+
+ $priority_list_tts = execMethod('helpdesk.botts.get_priority_list');
+
+ if ($priority_list_tts)
+ {
+ foreach ($priority_list_tts as $entry)
+ {
+ $_priority_tts[$entry['id']] = $entry['name'];
+ }
+ }
+
+ create_select_box('Default Priority TTS', 'prioritydefault',
$_priority_tts, 'The default priority for tickets in the Helpdesk-submodule');
+
+ $cats = CreateObject('phpgwapi.categories', -1, 'helpdesk', '.ticket');
+
+ $cat_data = $cats->formatted_xslt_list(array('globals' => true,
'link_data' => array()));
+ $cat_list = $cat_data['cat_list'];
+
+ if (is_array($cat_list))
+ {
+ foreach ($cat_list as $entry)
+ {
+ $_categories_tts[$entry['cat_id']] = $entry['name'];
+ }
+ }
+
+ unset($sotts);
+ create_select_box('default ticket categories', 'tts_category',
$_categories_tts, 'The default category for TTS');
+
+ $yes_and_no = array(
+ '1' => 'Yes',
+ '2' => 'No'
+ );
+
+ create_select_box('Filter tickets on assigned to me',
'tts_assigned_to_me', $yes_and_no, '');
+ create_select_box('Notify me by mail when ticket is assigned or
altered', 'tts_notify_me', $yes_and_no, '');
+
+ create_select_box('Send e-mail from TTS', 'tts_user_mailnotification',
$yes_and_no, 'Send e-mail from TTS as default');
+
+ create_select_box('Set myself as contact when adding a ticket',
'tts_me_as_contact', $yes_and_no, '');
+
+ create_input_box('With of textarea', 'textareacols', 'With of textarea
in forms');
+ create_input_box('Height of textarea', 'textarearows', 'Height of
textarea in forms');
Added: trunk/helpdesk/setup/phpgw_no.lang
===================================================================
--- trunk/helpdesk/setup/phpgw_no.lang (rev 0)
+++ trunk/helpdesk/setup/phpgw_no.lang 2016-07-25 12:06:21 UTC (rev 15369)
@@ -0,0 +1,176 @@
+%1 group helpdesk no %1 gruppe
+(filtered from _max_ total entries) helpdesk no (filtrert fra
_max_ totalt antall)
+address helpdesk no Adresse
+active helpdesk no Aktiv
+enable helpdesk no Aktiver
+all helpdesk no Alle
+enter the details of this ticket helpdesk no Angi
detajlbeskrivelse av melding
+please give som details ! helpdesk no Angi detaljer
+set the status of the ticket helpdesk no Angi status for
meldingen
+open helpdesk no Åpen
+of helpdesk no av
+of total helpdesk no av I alt
+cancel helpdesk no Avbryt
+closed helpdesk no Avsluttet
+processing... helpdesk no Behandler data
+descr helpdesk no Beskrivelse
+bookmarks helpdesk no Bokmerker
+user helpdesk no Bruker
+part of town helpdesk no Bydel
+building part helpdesk no Bygningsdel
+date helpdesk no Dato
+date opened helpdesk no Dato startet
+disable helpdesk no Deaktivert
+details helpdesk no Detaljer
+edit helpdesk no Editer
+modified date helpdesk no Endret dato
+email helpdesk no Epost
+email-address of the user, eg. %1 helpdesk no Epost adressen
til brukeren, f.eks. %1
+last name helpdesk no Etternavn
+actual cost changed helpdesk no Faktisk kostnad er endret
+error helpdesk no Feil
+finnish date helpdesk no Ferdigdato
+file helpdesk no Fil
+files helpdesk no Filer
+filename helpdesk no Filnavn
+filter helpdesk no Filter
+float helpdesk no Flyttall
+first name helpdesk no Fornavn
+prev helpdesk no Forrige
+old value helpdesk no Forrige verdi
+first helpdesk no Første
+first note added helpdesk no Første notat er registrert
+from helpdesk no Fra
+general helpdesk no Generell
+notify helpdesk no Varsle
+re-opened helpdesk no Gjenåpnet
+group helpdesk no Gruppe
+action helpdesk no Handling
+helpdesk helpdesk no Helpdesk
+integer helpdesk no Heltall
+event helpdesk no Hendelse
+history helpdesk no Historikk
+help helpdesk no Hjelp
+home helpdesk no Hjem
+id helpdesk no Id
+no part of town helpdesk no Ingen bydel
+no data helpdesk no Ingen data
+no data available in table helpdesk no Ingen data I tabellen
+no group helpdesk no Ingen gruppe
+no category helpdesk no Ingen kategori
+no matching records found helpdesk no Ingen treff
+preferences helpdesk no Innstillinger
+yes helpdesk no Ja
+char helpdesk no Karakter
+directory created helpdesk no Katalog er opprettet
+category helpdesk no Kategori
+category changed helpdesk no Kategori er endret
+click to view file helpdesk no Klikk for å vise fil
+click this link to select helpdesk no Klikk på lenken for å
velge
+columns helpdesk no Kolonner
+contact helpdesk no Kontakt
+contact phone helpdesk no Kontakttelefon
+save helpdesk no Lagre
+submit helpdesk no Lagre
+save the ticket helpdesk no Lagre meldingen
+save the entry and return to list helpdesk no Lagre posten og
returnere til oversikten
+download helpdesk no Last ned
+upload file helpdesk no Last opp fil
+upload multiple files helpdesk no Last opp mange filer
+loading... helpdesk no Laster
+add helpdesk no Legg til
+add ticket helpdesk no Legg til melding
+add new comments helpdesk no Legg til ny kommentar
+paste image data helpdesk no Lim inn bildedata
+login helpdesk no Logg in
+logout helpdesk no Logg ut
+location helpdesk no Lokasjon
+member helpdesk no Medlem
+ticket %1 has been saved helpdesk no Melding %1 er lagret
+ticket %1 has been deleted helpdesk no Melding %1 er slettet
+my submitted tickets helpdesk no Meldinger startet av meg
+check to attach file helpdesk no Merk for å legge ved fil
+check to delete file helpdesk no Merk for å slette fil
+note helpdesk no Merknad
+method helpdesk no Metode
+my assigned tickets helpdesk no Mine tildelte meldinger
+failed to upload file ! helpdesk no Opplasting av fil feilet
+tax code helpdesk no MVA-kode
+name helpdesk no Navn
+no helpdesk no Nei
+next helpdesk no Neste
+memo helpdesk no Notat
+new helpdesk no Ny
+new note helpdesk no Ny kommentar
+new value helpdesk no Ny verdi
+ok helpdesk no OK
+about helpdesk no Om
+update subject helpdesk no Oppdater overskrift
+failed to create directory helpdesk no Opplasting av fil feilet
+organisation helpdesk no Organisasjon
+subject helpdesk no Overskrift
+subject changed helpdesk no Overskrift er endret
+password helpdesk no Passord
+item helpdesk no Post
+print view helpdesk no Print visning
+priority helpdesk no Prioritet
+priority changed helpdesk no Prioritet er endret
+percent helpdesk no prosent
+project helpdesk no Prosjekt
+reported by helpdesk no Rapportert av
+entry date helpdesk no Registrert dato
+entry_date helpdesk no Registrert dato
+send helpdesk no Send
+choose to send mailnotification helpdesk no Send epost
+send e-mail helpdesk no Send epost
+sent by email to helpdesk no sendt med epost til
+last helpdesk no Siste
+enter the subject of this ticket helpdesk no Skriv overskrift
+print helpdesk no Skriv ut
+print the ticket helpdesk no Skriv ut melding
+delete helpdesk no Slett
+delete file helpdesk no Slett fil
+delete the ticket helpdesk no Slett meldingen
+sms helpdesk no SMS
+search helpdesk no Søk
+: activate to sort column ascending helpdesk no Sorter stigende
+: activate to sort column descending helpdesk no Sorter synkende
+opened helpdesk no Startet
+opened by helpdesk no Startet av
+status helpdesk no Status
+status changed helpdesk no Status er endret
+highest helpdesk no Høyest
+lowest helpdesk no Lavest
+support helpdesk no Support
+take over helpdesk no Ta over
+take over the assignment for this ticket helpdesk no Ta over
ansvaret for denne meldingen
+to helpdesk no Til
+back to the ticket list helpdesk no Tilbake til oversikten
+assign to helpdesk no Tildel til
+assigned to helpdesk no Tildelt til
+done helpdesk no Avbryt
+select all helpdesk no Velg alle
+select the user the selection belongs to. to do not use a user select no user
helpdesk no Velg bruker
+select user helpdesk no Velg bruker
+select the part of town the building belongs to. to do not use a part of town
- select no part of town helpdesk no Velg bydel
+select date helpdesk no Velg dato
+please select a person or a group to handle the ticket ! helpdesk
no Velg enten person eller gruppe
+select the estimated date for closing the task helpdesk no Velg
estimert ferdigdato
+select file to upload helpdesk no Velg fil for opplasting
+select none helpdesk no Velg ingen
+please select a category ! helpdesk no Velg kategori
+select the category the data belong to. to do not use a category select no
category helpdesk no Velg kategori.
+select the priority the selection belongs to helpdesk no Velg
prioritet
+select the priority the selection belongs to. helpdesk no Velg
prioritet
+version helpdesk no Versjon
+re-assigned helpdesk no Videresendt
+re-assigned group helpdesk no Videresendt gruppe
+do you really want to delete this ticket helpdesk no Vil du
virkelig slette meldingen
+view helpdesk no Vis
+view ticket detail helpdesk no Vis detaljer
+view statustext helpdesk no Vis melding
+list ticket helpdesk no List meldinger
+billable hours helpdesk no Egne timer
+change to helpdesk no Endre til
+do you really want to change the status to %1 helpdesk no Vil du
virkelig endre status til %1
+do you really want to change the priority to %1 helpdesk no
Vil du virkelig endre prioritet til %1
\ No newline at end of file
Modified: trunk/helpdesk/setup/setup.inc.php
===================================================================
--- trunk/helpdesk/setup/setup.inc.php 2016-07-25 12:05:32 UTC (rev 15368)
+++ trunk/helpdesk/setup/setup.inc.php 2016-07-25 12:06:21 UTC (rev 15369)
@@ -12,7 +12,7 @@
*/
$setup_info['helpdesk']['name'] = 'helpdesk';
- $setup_info['helpdesk']['version'] = '0.9.18.000';
+ $setup_info['helpdesk']['version'] = '0.9.18.001';
$setup_info['helpdesk']['app_order'] = 8;
$setup_info['helpdesk']['enable'] = 1;
$setup_info['helpdesk']['app_group'] = 'office';
Modified: trunk/helpdesk/setup/tables_current.inc.php
===================================================================
--- trunk/helpdesk/setup/tables_current.inc.php 2016-07-25 12:05:32 UTC (rev
15368)
+++ trunk/helpdesk/setup/tables_current.inc.php 2016-07-25 12:06:21 UTC (rev
15369)
@@ -68,7 +68,8 @@
'order_cat_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'building_part'=> array('type' =>
'varchar','precision' => 4,'nullable' => True),
'order_dim1'=> array('type' =>
'int','precision' => 4,'nullable' => True),
- 'publish_note'=> array('type' =>
'int','precision' => 2,'nullable' => True)
+ 'publish_note'=> array('type' =>
'int','precision' => 2,'nullable' => True),
+ 'modified_date' => array('type' => 'int',
'precision' => '8', 'nullable' => True),
),
'pk' => array('id'),
'ix' => array(),
Added: trunk/helpdesk/setup/tables_update.inc.php
===================================================================
--- trunk/helpdesk/setup/tables_update.inc.php (rev 0)
+++ trunk/helpdesk/setup/tables_update.inc.php 2016-07-25 12:06:21 UTC (rev
15369)
@@ -0,0 +1,33 @@
+<?php
+ /**
+ * phpGroupWare - property: a Facilities Management System.
+ *
+ * @author Sigurd Nes <address@hidden>
+ * @copyright Copyright (C) 2003-2009 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
+ * @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
+ * @package helpdesk
+ * @subpackage setup
+ * @version $Id: tables_update.inc.php 15163 2016-05-13 14:24:03Z
sigurdne $
+ */
+ /**
+ * Update helpdesk version from 0.9.18.000 to 0.9.18.001
+ */
+ $test[] = '0.9.18.000';
+
+ function helpdesk_upgrade0_9_18_000()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_helpdesk_tickets',
'modified_date', array(
+ 'type' => 'int',
+ 'precision' => 8,
+ 'nullable' => True)
+ );
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['helpdesk']['currentver'] =
'0.9.18.001';
+ return $GLOBALS['setup_info']['helpdesk']['currentver'];
+ }
+ }
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15369] more on helpdesk,
sigurdne <=