[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] tts/viewticket_details.php, 1.42.2.6.4.3
From: |
nomail |
Subject: |
[Phpgroupware-cvs] tts/viewticket_details.php, 1.42.2.6.4.3 |
Date: |
Thu, 20 May 2004 14:59:01 -0000 |
Update of /tts
Modified Files:
Branch: Version-0_9_16-branch
viewticket_details.php
date: 2004/04/16 11:30:05; author: lpiepho; state: Exp; lines: +45 -25
Log Message:
General improvements and bugfixing
=====================================================================
No syntax errors detected in -
=====================================================================
Index: tts/viewticket_details.php
diff -u tts/viewticket_details.php:1.42.2.6.4.2
tts/viewticket_details.php:1.42.2.6.4.3
--- tts/viewticket_details.php:1.42.2.6.4.2 Tue Jan 20 05:03:42 2004
+++ tts/viewticket_details.php Fri Apr 16 11:30:05 2004
@@ -21,6 +21,7 @@
);
$submit = $_POST['submit'];
$cancel = $_POST['cancel'];
+ $ticket_id = $_REQUEST['ticket_id'];
if($submit)
{
@@ -406,7 +407,7 @@
$GLOBALS['phpgw']->template->set_var('value_subject',
stripslashes($ticket['subject']));
$GLOBALS['phpgw']->template->set_var('lang_additional_notes',lang('Additional
notes'));
- $GLOBALS['phpgw']->template->set_var('lang_ok', lang('OK'));
+ $GLOBALS['phpgw']->template->set_var('lang_ok', lang('Save'));
$GLOBALS['phpgw']->template->set_var('done_url',$GLOBALS['phpgw']->link('/tts/index.php'));
$GLOBALS['phpgw']->template->set_var('lang_done', lang('done'));
@@ -424,6 +425,20 @@
$GLOBALS['phpgw']->db->query("select * from phpgw_tts_tickets
where ticket_id='$ticket_id'",__LINE__,__FILE__);
$GLOBALS['phpgw']->db->next_record();
+ $ticket['billable_hours'] = $_POST['ticket']['billable_hours'];
+ $ticket['billable_rate'] = $_POST['ticket']['billable_rate'];
+ $ticket['assignedto'] = $_POST['ticket']['assignedto'];
+ $ticket['category'] = $_POST['ticket']['category'];
+ $ticket['note'] = $_POST['ticket']['note'];
+ $ticket['priority'] = $_POST['ticket']['priority'];
+ $ticket['group'] = $_POST['ticket']['group'];
+ $ticket['status'] = $_POST['ticket']['status'];
+ $ticket['type'] = $_POST['ticket']['type'];
+ $ticket['deadline'] = $_POST['ticket']['deadline'];
+ $ticket['effort'] = $_POST['ticket']['effort'];
+ $ticket['platform'] = $_POST['ticket']['platform'];
+ $ticket['attachment'] = $_POST['ticket']['attachment'];
+
$oldassigned = $GLOBALS['phpgw']->db->f('ticket_assignedto');
$oldpriority = $GLOBALS['phpgw']->db->f('ticket_priority');
$oldcategory = $GLOBALS['phpgw']->db->f('ticket_category');
@@ -436,6 +451,7 @@
$old_effort = $GLOBALS['phpgw']->db->f('ticket_effort');
$old_platform = $GLOBALS['phpgw']->db->f('ticket_platform');
$old_attachment = $GLOBALS['phpgw']->db->f('ticket_attachment');
+ $old_details = $GLOBALS['phpgw']->db->f('ticket_details');
$GLOBALS['phpgw']->db->transaction_begin();
@@ -459,24 +475,7 @@
** M - Attachment
*/
- if($old_status != $ticket['status'])
- {
- //only allow assigned-to or admin members to close
tickets
- if(($GLOBALS['phpgw_info']['user']['account_id'] ==
$oldassigned) ||
-
($GLOBALS['phpgw']->acl->get_specific_rights('Admins','phpgw_group')))
- {
- $fields_updated = True;
-
$GLOBALS['phpgw']->historylog->add($ticket['status'],$ticket_id,$ticket['status'],$old_status);
-
- $GLOBALS['phpgw']->db->query("update
phpgw_tts_tickets set ticket_status='"
- . $ticket['status'] . "' where
ticket_id='$ticket_id'",__LINE__,__FILE__);
- }
- else
- {
- $messages .= '<br>You can only close a ticket
if it is assigned to you.';
-
$GLOBALS['phpgw']->session->appsession('messages','tts',lang($messages));
- }
- }
+
if($old_group != $ticket['group'])
{
@@ -510,7 +509,7 @@
$GLOBALS['phpgw']->historylog->add('T',$ticket_id,$ticket['category'],$oldcategory);
}
- if($old_billable_hours != $ticket['billable_hours'])
+ if($old_billable_hours != $ticket['billable_hours'] &&
$ticket['billable_hours'])
{
$fields_updated = True;
$GLOBALS['phpgw']->db->query("update phpgw_tts_tickets
set ticket_billable_hours='" . $ticket['billable_hours']
@@ -518,7 +517,7 @@
$GLOBALS['phpgw']->historylog->add('H',$ticket_id,$ticket['billable_hours'],$old_billable_hours);
}
- if($old_billable_rate != $ticket['billable_rate'])
+ if($old_billable_rate != $ticket['billable_rate'] &&
$ticket['billable_rate'])
{
$fields_updated = True;
$GLOBALS['phpgw']->db->query("update phpgw_tts_tickets
set ticket_billable_rate='" . $ticket['billable_rate']
@@ -526,7 +525,7 @@
$GLOBALS['phpgw']->historylog->add('B',$ticket_id,$ticket['billable_rate'],$old_billable_rate);
}
- if ($old_type != $ticket['type'] && strlen($ticket['type']))
+ if ($old_type != $ticket['type'] && $ticket['type'] != "")
{
$fields_updated = True;
$GLOBALS['phpgw']->db->query("update phpgw_tts_tickets
set ticket_type='" . $ticket['type']
@@ -542,7 +541,7 @@
$GLOBALS['phpgw']->historylog->add('D',$ticket_id,$ticket['deadline'],$old_deadline);
}
- if ($old_effort != $ticket['effort'])
+ if ($old_effort != $ticket['effort'] && $ticket['effort'] != "")
{
$fields_updated = True;
$GLOBALS['phpgw']->db->query("update phpgw_tts_tickets
set ticket_effort='" . $ticket['effort']
@@ -550,7 +549,7 @@
$GLOBALS['phpgw']->historylog->add('E',$ticket_id,$ticket['effort'],$old_effort);
}
- if ($old_platform != $ticket['platform'] &&
strlen($ticket['platform']))
+ if ($old_platform != $ticket['platform'] && $ticket['platform']
!= "")
{
$fields_updated = True;
$GLOBALS['phpgw']->db->query("update phpgw_tts_tickets
set ticket_platform='" . $ticket['platform']
@@ -581,6 +580,27 @@
$GLOBALS['phpgw']->db->query("update phpgw_tts_tickets
set ticket_attachment='" . $file_id . "' where
ticket_id='$ticket_id'",__LINE__,__FILE__);
$GLOBALS['phpgw']->historylog->add('M',$ticket_id,$ticket['attachment']['name'],'');
+ }
+
+
+ if($old_status != $_POST['ticket']['status'])
+ {
+ //only allow assigned-to or admin members to close
tickets
+ if(($GLOBALS['phpgw_info']['user']['account_id'] ==
$oldassigned) ||
+
($GLOBALS['phpgw']->applications->data['admin']['enabled'] == 1))
+ {
+
+ $fields_updated = True;
+
$GLOBALS['phpgw']->historylog->add($_POST['ticket']['status'],$ticket_id,$_POST['ticket']['status'],$old_status);
+
+ $GLOBALS['phpgw']->db->query("update
phpgw_tts_tickets set ticket_status='"
+ . $_POST['ticket']['status'] . "' where
ticket_id='$ticket_id'",__LINE__,__FILE__);
+ }
+ else
+ {
+ $messages .= '<br>You can only close a ticket
if it is assigned to you.';
+
$GLOBALS['phpgw']->session->appsession('messages','tts',lang($messages));
+ }
}
if($ticket['note'])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] tts/viewticket_details.php, 1.42.2.6.4.3,
nomail <=