[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.botts.inc.php inc/class.hist...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property inc/class.botts.inc.php inc/class.hist... |
|
Date: |
Tue, 19 Sep 2006 21:09:49 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/09/19 21:09:49
Modified files:
inc : class.botts.inc.php class.historylog.inc.php
class.socommon.inc.php class.sotts2.inc.php
class.uitts.inc.php
templates/base : tts.xsl
Log message:
notice
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.botts.inc.php?cvsroot=phpgroupware&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.historylog.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.socommon.inc.php?cvsroot=phpgroupware&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.sotts2.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uitts.inc.php?cvsroot=phpgroupware&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/tts.xsl?cvsroot=phpgroupware&r1=1.12&r2=1.13
Patches:
Index: inc/class.botts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- inc/class.botts.inc.php 18 Sep 2006 18:26:43 -0000 1.25
+++ inc/class.botts.inc.php 19 Sep 2006 21:09:48 -0000 1.26
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.botts.inc.php,v 1.25 2006/09/18 18:26:43 sigurdne
Exp $
+ * @version $Id: class.botts.inc.php,v 1.26 2006/09/19 21:09:48 sigurdne
Exp $
*/
/**
@@ -208,10 +208,11 @@
$priority_comment[5]=' - '.lang('Medium');
$priority_comment[10]=' - '.lang('Highest');
+ $priorities = array();
for ($i=1; $i<=10; $i++)
{
$priorities[$i]['id'] =$i;
- $priorities[$i]['name'] =$i .
$priority_comment[$i];
+ $priorities[$i]['name'] =$i .
(isset($priority_comment[$i])?$priority_comment[$i]:'');
}
return
$this->bocommon->select_list($selected,$priorities);
@@ -387,8 +388,11 @@
$i++;
}
+ if(isset ($additional_notes))
+ {
return $additional_notes;
}
+ }
function read_record_history($id)
Index: inc/class.historylog.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.historylog.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- inc/class.historylog.inc.php 13 Jun 2006 12:38:01 -0000 1.11
+++ inc/class.historylog.inc.php 19 Sep 2006 21:09:48 -0000 1.12
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.historylog.inc.php,v 1.11 2006/06/13 12:38:01
sigurdne Exp $
+ * @version $Id: class.historylog.inc.php,v 1.12 2006/09/19 21:09:48
sigurdne Exp $
*/
/**
@@ -102,11 +102,17 @@
function add($status,$record_id,$new_value,$old_value
='',$attrib_id='', $date='')
{
+
if($attrib_id)
{
$attrib_id_field = ',history_entity_attrib_id';
$attrib_id_value = ",$attrib_id";
}
+ else
+ {
+ $attrib_id_field = '';
+ $attrib_id_value = '';
+ }
if($date)
{
@@ -143,7 +149,8 @@
$filtered[] = "history_status != '$_filter'";
}
- if (is_array($filtered))
+ $filter = '';
+ if (isset($filtered))
{
$filter = ' and ' . implode(' and ',$filtered);
}
@@ -158,7 +165,8 @@
$_only_show[] = "history_status='$_filter'";
}
- if (is_array($_only_show))
+ $only_show_filter = '';
+ if (isset($_only_show))
{
$only_show_filter = ' and (' . implode(' or
',$_only_show) . ')';
}
@@ -166,6 +174,7 @@
$this->db->query("select * from $this->table where
history_appname='"
. $this->appname . "' and
history_record_id='$record_id' $filter $only_show_filter "
. "$orderby",__LINE__,__FILE__);
+
while ($this->db->next_record())
{
$return_values[] = array(
@@ -178,6 +187,10 @@
'datetime' =>
$this->db->from_timestamp($this->db->f('history_timestamp'))
);
}
+
+ if(isset ($return_values))
+ {
return $return_values;
}
}
+ }
Index: inc/class.socommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- inc/class.socommon.inc.php 18 Sep 2006 18:26:43 -0000 1.24
+++ inc/class.socommon.inc.php 19 Sep 2006 21:09:48 -0000 1.25
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.socommon.inc.php,v 1.24 2006/09/18 18:26:43
sigurdne Exp $
+ * @version $Id: class.socommon.inc.php,v 1.25 2006/09/19 21:09:48
sigurdne Exp $
*/
/**
@@ -318,8 +318,11 @@
$i++;
}
+ if (isset($entity))
+ {
return $entity;
}
+ }
function increment_id($name)
{
Index: inc/class.sotts2.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.sotts2.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- inc/class.sotts2.inc.php 3 Mar 2006 17:48:03 -0000 1.11
+++ inc/class.sotts2.inc.php 19 Sep 2006 21:09:48 -0000 1.12
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.sotts2.inc.php,v 1.11 2006/03/03 17:48:03
sigurdne Exp $
+ * @version $Id: class.sotts2.inc.php,v 1.12 2006/09/19 21:09:48
sigurdne Exp $
*/
/**
@@ -111,8 +111,8 @@
$oldpriority = $this->db->f('priority');
$oldcat_id =
$this->db->f('cat_id');
$old_status = $this->db->f('status');
- $old_billable_hours =
$this->db->f('billable_hours');
- $old_billable_rate = $this->db->f('billable_rate');
+ // $old_billable_hours =
$this->db->f('billable_hours');
+ // $old_billable_rate = $this->db->f('billable_rate');
$old_subject = $this->db->f('subject');
if($oldcat_id ==0){$oldcat_id ='';}
if($oldassigned ==0){$oldassigned ='';}
@@ -230,7 +230,7 @@
$this->historylog->add('T',$id,$ticket['cat_id'],$oldcat_id);
}
- if ($old_billable_hours != $ticket['billable_hours'])
+ /* if ($old_billable_hours != $ticket['billable_hours'])
{
$fields_updated = True;
$this->db->query("update fm_tts_tickets set
billable_hours='" . $ticket['billable_hours']
@@ -245,7 +245,7 @@
. "' 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 fm_tts_tickets set
subject='" . $ticket['subject']
@@ -266,7 +266,7 @@
{
$this->config->read_repository();
- if
($this->config->config_data['mailnotification'] && $ticket['send_mail'])
+ if
(isset($this->config->config_data['mailnotification']) && $ticket['send_mail'])
{
$receipt=$this->bo->mail_ticket($id,$fields_updated,'',$location_code);
Index: inc/class.uitts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- inc/class.uitts.inc.php 18 Sep 2006 18:26:43 -0000 1.40
+++ inc/class.uitts.inc.php 19 Sep 2006 21:09:48 -0000 1.41
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.uitts.inc.php,v 1.40 2006/09/18 18:26:43 sigurdne
Exp $
+ * @version $Id: class.uitts.inc.php,v 1.41 2006/09/19 21:09:48 sigurdne
Exp $
*/
/**
@@ -795,10 +795,11 @@
$id = get_var('id',array('GET'));
$values = get_var('values',array('POST','GET'));
+ $receipt = '';
$GLOBALS['phpgw']->xslttpl->add_file(array('tts'));
- if($values['save'])
+ if(isset($values['save']))
{
if(!$this->acl_edit)
{
@@ -829,22 +830,6 @@
);
-/* for ($i=0;$i<count($ticket['origin']);$i++)
- {
- if($ticket['origin'][$i]['type'] == 'project')
- {
- $order_link_data = array
- (
- 'menuaction' =>
$this->currentapp.'.uiproject.edit',
- 'id' =>
$ticket['origin'][$i]['data'][0]['id']
- );
- break;
- }
- }
-
-*/
- if(!$order_link_data)
- {
$order_link_data = array
(
'menuaction' =>
$this->currentapp.'.uiproject.edit',
@@ -857,7 +842,6 @@
'origin' => 'tts',
'origin_id' => $id
);
- }
$form_link = array
(
@@ -887,10 +871,10 @@
'values' =>
$ticket['location_data'],
'type_id' =>
count(explode('-',$ticket['location_data']['location_code'])),
'no_link' => False, //
disable lookup links for location type less than type_id
- 'tenant' =>
$ticket['location_data']['tenant_id'],
+ 'tenant' =>
(isset($ticket['location_data']['tenant_id'])?$ticket['location_data']['tenant_id']:''),
'lookup_type' => 'view',
'lookup_entity' =>
$this->bocommon->get_lookup_entity('ticket'),
- 'entity_data' => $ticket['p']
+ 'entity_data' =>
(isset($ticket['p'])?$ticket['p']:'')
));
@@ -905,33 +889,15 @@
}
}
-
if ($ticket['cat_id'])
{
$this->cat_id = $ticket['cat_id'];
}
-
-/*
- if($ticket['request_id'])
- {
- $request_lookup_data = array
- (
- 'menuaction' =>
$this->currentapp.'.uirequest.view'
- );
- }
- if($ticket['project_id'])
- {
- $project_lookup_data = array
- (
- 'menuaction' =>
$this->currentapp.'.uiproject.view'
- );
- }
-
-*/
$start_entity =
$this->bocommon->get_start_entity('ticket');
//_debug_array($start_entity);
+ $link_entity = '';
if (isset($start_entity) AND is_array($start_entity))
{
$i=0;
@@ -1014,10 +980,7 @@
$data = array
(
- 'value_origin' =>
$ticket['origin'],
- 'value_origin_type' =>
$origin,
- 'value_origin_id' =>
$origin_id,
-
+ 'value_origin' =>
(isset($ticket['origin'])?$ticket['origin']:''),
'lang_dateformat' =>
strtolower($dateformat),
'dateformat_validate' =>
$dateformat_validate,
'onKeyUp' =>
$onKeyUp,
@@ -1029,15 +992,15 @@
'link_entity' =>
$link_entity,
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'lang_request' =>
lang('Request'),
- 'lang_request_statustext' =>
lang('Link to the request originatet from this ticket'),
+ // 'lang_request' =>
lang('Request'),
+ // 'lang_request_statustext' =>
lang('Link to the request originatet from this ticket'),
// 'link_request' =>
$GLOBALS['phpgw']->link('/index.php',$request_lookup_data),
- 'value_request_id' =>
$ticket['request_id'],
+ // 'value_request_id' =>
$ticket['request_id'],
- 'lang_project' =>
lang('Project'),
- 'lang_project_statustext' =>
lang('Link to the project originatet from this ticket'),
+ // 'lang_project' =>
lang('Project'),
+ // 'lang_project_statustext' =>
lang('Link to the project originatet from this ticket'),
// 'link_project' =>
$GLOBALS['phpgw']->link('/index.php',$project_lookup_data),
- 'value_project_id' =>
$ticket['project_id'],
+ // 'value_project_id' =>
$ticket['project_id'],
'location_data' =>
$location_data,
'lang_location_code' =>
lang('Location Code'),
@@ -1113,10 +1076,10 @@
'lang_done' =>
lang('done'),
'lang_contact_phone' =>
lang('Contact phone'),
'contact_phone' =>
$ticket['contact_phone'],
- 'mailnotification' =>
$this->bo->config->config_data['mailnotification'],
+ 'mailnotification' =>
(isset($this->bo->config->config_data['mailnotification'])?true:''),
'lang_mailnotification' =>
lang('Send e-mail'),
'lang_mailnotification_statustext' =>
lang('Choose to send mailnotification'),
- 'pref_send_mail' =>
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_user_mailnotification'],
+ 'pref_send_mail' =>
(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_user_mailnotification'])?$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_user_mailnotification']:''),
);
//_debug_array($data);
$appname =
lang('helpdesk');
Index: templates/base/tts.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/tts.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- templates/base/tts.xsl 10 Apr 2006 09:39:12 -0000 1.12
+++ templates/base/tts.xsl 19 Sep 2006 21:09:48 -0000 1.13
@@ -1,4 +1,4 @@
-<!-- $Id: tts.xsl,v 1.12 2006/04/10 09:39:12 sigurdne Exp $ -->
+<!-- $Id: tts.xsl,v 1.13 2006/09/19 21:09:48 sigurdne Exp $ -->
<xsl:template name="app_data">
<xsl:choose>
@@ -541,7 +541,7 @@
</td>
</tr>
</xsl:for-each>
- <xsl:choose>
+ <!-- <xsl:choose>
<xsl:when test="value_request_id!=''">
<tr>
<td class="th_text"
align="left" valign="top">
@@ -575,6 +575,7 @@
</tr>
</xsl:when>
</xsl:choose>
+ -->
<tr>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property inc/class.botts.inc.php inc/class.hist...,
Sigurd Nes <=