[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.uitts.inc.php class.uiprojec...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.uitts.inc.php class.uiprojec... |
|
Date: |
Mon, 18 Sep 2006 13:11:37 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/09/18 13:11:36
Modified files:
inc : class.uitts.inc.php class.uiproject.inc.php
class.uientity.inc.php class.uirequest.inc.php
class.bocommon.inc.php
Log message:
link
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uitts.inc.php?cvsroot=phpgroupware&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiproject.inc.php?cvsroot=phpgroupware&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uientity.inc.php?cvsroot=phpgroupware&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uirequest.inc.php?cvsroot=phpgroupware&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bocommon.inc.php?cvsroot=phpgroupware&r1=1.35&r2=1.36
Patches:
Index: class.uitts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- class.uitts.inc.php 14 Sep 2006 08:31:11 -0000 1.38
+++ class.uitts.inc.php 18 Sep 2006 13:11:34 -0000 1.39
@@ -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.38 2006/09/14 08:31:11 sigurdne
Exp $
+ * @version $Id: class.uitts.inc.php,v 1.39 2006/09/18 13:11:34 sigurdne
Exp $
*/
/**
@@ -825,7 +825,8 @@
'origin_id' => $id
);
- for ($i=0;$i<count($ticket['origin']);$i++)
+
+/* for ($i=0;$i<count($ticket['origin']);$i++)
{
if($ticket['origin'][$i]['type'] ==
'project')
{
@@ -838,7 +839,7 @@
}
}
-
+*/
if(!$order_link_data)
{
$order_link_data = array
@@ -982,12 +983,12 @@
$msgbox_data = $this->bocommon->msgbox_data($receipt);
-
if (isset($ticket['origin']) AND
is_array($ticket['origin']))
{
for ($i=0;$i<count($ticket['origin']);$i++)
{
-
$ticket['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp . $ticket['origin'][$i]['link']));
+
$ticket['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',$ticket['origin'][$i]['link']);
+
if(substr($ticket['origin'][$i]['type'],0,6)=='entity')
{
$type =
explode("_",$ticket['origin'][$i]['type']);
@@ -1027,12 +1028,12 @@
'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),
+ // 'link_request' =>
$GLOBALS['phpgw']->link('/index.php',$request_lookup_data),
'value_request_id' =>
$ticket['request_id'],
'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),
+ // 'link_project' =>
$GLOBALS['phpgw']->link('/index.php',$project_lookup_data),
'value_project_id' =>
$ticket['project_id'],
'location_data' =>
$location_data,
@@ -1114,7 +1115,7 @@
'lang_mailnotification_statustext' =>
lang('Choose to send mailnotification'),
'pref_send_mail' =>
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['tts_user_mailnotification'],
);
-
+//_debug_array($data);
$appname =
lang('helpdesk');
$function_msg =
lang('view ticket detail');
Index: class.uiproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- class.uiproject.inc.php 12 Sep 2006 08:54:08 -0000 1.32
+++ class.uiproject.inc.php 18 Sep 2006 13:11:35 -0000 1.33
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.uiproject.inc.php,v 1.32 2006/09/12 08:54:08
sigurdne Exp $
+ * @version $Id: class.uiproject.inc.php,v 1.33 2006/09/18 13:11:35
sigurdne Exp $
*/
/**
@@ -909,7 +909,7 @@
{
for ($i=0;$i<count($values['origin']);$i++)
{
-
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp . $values['origin'][$i]['link']));
+
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',$values['origin'][$i]['link']);
if(substr($values['origin'][$i]['type'],0,6)=='entity')
{
$type =
explode("_",$values['origin'][$i]['type']);
@@ -1209,7 +1209,7 @@
{
for ($i=0;$i<count($values['origin']);$i++)
{
-
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp . $values['origin'][$i]['link']));
+
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',$values['origin'][$i]['link']);
if(substr($values['origin'][$i]['type'],0,6)=='entity')
{
$type =
explode("_",$values['origin'][$i]['type']);
Index: class.uientity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uientity.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- class.uientity.inc.php 13 Sep 2006 18:29:17 -0000 1.24
+++ class.uientity.inc.php 18 Sep 2006 13:11:35 -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 entity
- * @version $Id: class.uientity.inc.php,v 1.24 2006/09/13 18:29:17
sigurdne Exp $
+ * @version $Id: class.uientity.inc.php,v 1.25 2006/09/18 13:11:35
sigurdne Exp $
*/
/**
@@ -878,7 +878,7 @@
//_debug_array($values['origin']);
for ($i=0;$i<count($values['origin']);$i++)
{
-
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',
array('menuaction'=> $this->currentapp . $values['origin'][$i]['link']));
+
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',$values['origin'][$i]['link']);
if(substr($values['origin'][$i]['type'],0,6)=='entity')
{
$type =
explode("_",$values['origin'][$i]['type']);
@@ -1144,7 +1144,7 @@
{
for ($i=0;$i<count($values['origin']);$i++)
{
-
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',
array('menuaction'=> $this->currentapp . $values['origin'][$i]['link']));
+
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',$values['origin'][$i]['link']);
if(substr($values['origin'][$i]['type'],0,6)=='entity')
{
$type =
explode("_",$values['origin'][$i]['type']);
Index: class.uirequest.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- class.uirequest.inc.php 12 Sep 2006 13:09:02 -0000 1.24
+++ class.uirequest.inc.php 18 Sep 2006 13:11:35 -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 project
- * @version $Id: class.uirequest.inc.php,v 1.24 2006/09/12 13:09:02
sigurdne Exp $
+ * @version $Id: class.uirequest.inc.php,v 1.25 2006/09/18 13:11:35
sigurdne Exp $
*/
/**
@@ -860,7 +860,7 @@
{
for ($i=0;$i<count($values['origin']);$i++)
{
-
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp . $values['origin'][$i]['link']));
+
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',$values['origin'][$i]['link']);
if(substr($values['origin'][$i]['type'],0,6)=='entity')
{
$type =
explode("_",$values['origin'][$i]['type']);
@@ -1171,7 +1171,7 @@
{
for ($i=0;$i<count($values['origin']);$i++)
{
-
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp . $values['origin'][$i]['link']));
+
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',$values['origin'][$i]['link']);
if(substr($values['origin'][$i]['type'],0,6)=='entity')
{
$type =
explode("_",$values['origin'][$i]['type']);
Index: class.bocommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- class.bocommon.inc.php 13 Sep 2006 12:56:22 -0000 1.35
+++ class.bocommon.inc.php 18 Sep 2006 13:11:35 -0000 1.36
@@ -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.bocommon.inc.php,v 1.35 2006/09/13 12:56:22
sigurdne Exp $
+ * @version $Id: class.bocommon.inc.php,v 1.36 2006/09/18 13:11:35
sigurdne Exp $
*/
/**
@@ -1374,23 +1374,27 @@
{
if($type=='tts'):
{
- $link = '.uitts.view';
+ $link = array('menuaction' =>
$this->currentapp.'.uitts.view');
}
elseif($type=='request'):
{
- $link = '.uirequest.view';
+ $link = array('menuaction' =>
$this->currentapp.'.uirequest.view');
}
elseif($type=='project'):
{
- $link = '.uiproject.view';
+ $link = array('menuaction' =>
$this->currentapp.'.uiproject.view');
}
elseif(substr($type,0,6)=='entity'):
{
-
$type = explode("_",$type);
$entity_id = $type[1];
$cat_id = $type[2];
- $link =
".uientity.view&entity_id=$entity_id&cat_id=$cat_id";
+ $link = array
+ (
+ 'menuaction' =>
$this->currentapp.'.uientity.view',
+ 'entity_id' => $entity_id,
+ 'cat_id' => $cat_id
+ );
}
endif;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.uitts.inc.php class.uiprojec...,
Sigurd Nes <=