[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] projects/inc class.uiprojecthours.inc.php class...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] projects/inc class.uiprojecthours.inc.php class... |
|
Date: |
Wed, 29 Nov 2006 21:31:07 +0000 |
CVSROOT: /sources/phpgroupware
Module name: projects
Changes by: Sigurd Nes <sigurdne> 06/11/29 21:31:07
Modified files:
inc : class.uiprojecthours.inc.php
class.uiprojects_base.inc.php
class.uistatistics.inc.php
Log message:
link
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.uiprojecthours.inc.php?cvsroot=phpgroupware&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.uiprojects_base.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/projects/inc/class.uistatistics.inc.php?cvsroot=phpgroupware&r1=1.65&r2=1.66
Patches:
Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- class.uiprojecthours.inc.php 28 Nov 2006 11:55:11 -0000 1.92
+++ class.uiprojecthours.inc.php 29 Nov 2006 21:31:07 -0000 1.93
@@ -6,7 +6,7 @@
* @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package projects
- * @version $Id: class.uiprojecthours.inc.php,v 1.92 2006/11/28 11:55:11
sigurdne Exp $
+ * @version $Id: class.uiprojecthours.inc.php,v 1.93 2006/11/29 21:31:07
sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v $
*/
@@ -862,7 +862,7 @@
$values['track_id'] = $track_id;
$this->bohours->save_hours($values);
}
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=projects.uiprojecthours.ttracker');
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>'projects.uiprojecthours.ttracker'));
}
//$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('edit time tracker entry');
@@ -1440,8 +1440,7 @@
{
$main =
$this->boprojects->read_single_project($pro_main,'hours');
$GLOBALS['phpgw']->template->set_var('pro_main',$main['title']);
-
$GLOBALS['phpgw']->template->set_var('main_url',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.view_project&action=mains&project_id='
-
. $pro_main));
+
$GLOBALS['phpgw']->template->set_var('main_url',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uiprojects.view_project','action'=>'mains','project_id'=>$pro_main)));
$GLOBALS['phpgw']->template->set_var('number_main',$main['number']);
$GLOBALS['phpgw']->template->set_var('coordinator_main',$main['coordinatorout']);
$GLOBALS['phpgw']->template->set_var('customer_main',$main['customerout']);
Index: class.uiprojects_base.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.uiprojects_base.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.uiprojects_base.inc.php 26 Nov 2006 14:14:26 -0000 1.17
+++ class.uiprojects_base.inc.php 29 Nov 2006 21:31:07 -0000 1.18
@@ -7,7 +7,7 @@
* @copyright Copyright (C) 2004-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package projects
- * @version $Id: class.uiprojects_base.inc.php,v 1.17 2006/11/26
14:14:26 sigurdne Exp $
+ * @version $Id: class.uiprojects_base.inc.php,v 1.18 2006/11/29
21:31:07 sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.uiprojects_base.inc.php,v $
*/
@@ -321,23 +321,23 @@
switch($this->siteconfig['accounting'])
{
case 'activity':
-
$GLOBALS['phpgw']->template->set_var('link_accounting',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.list_activities&action=act'));
+
$GLOBALS['phpgw']->template->set_var('link_accounting',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uiconfig.list_activities','action'=>'act')));
$GLOBALS['phpgw']->template->set_var('lang_accounting',lang('Activities'));
break;
default:
-
$GLOBALS['phpgw']->template->set_var('link_accounting',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.list_employees&action=accounting'));
+
$GLOBALS['phpgw']->template->set_var('link_accounting',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uiconfig.list_employees','action'=>'accounting')));
$GLOBALS['phpgw']->template->set_var('lang_accounting',lang('Accounting'));
}
$GLOBALS['phpgw']->template->fp('admin_header','projects_admin_header');
}
-
$GLOBALS['phpgw']->template->set_var('link_budget',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_budget&action=mains'));
-
$GLOBALS['phpgw']->template->set_var('link_jobs',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=subs'));
-
$GLOBALS['phpgw']->template->set_var('link_hours',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.list_projects&action=mains'));
-
$GLOBALS['phpgw']->template->set_var('link_ttracker',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojecthours.ttracker'));
-
$GLOBALS['phpgw']->template->set_var('link_statistics',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains'));
-
$GLOBALS['phpgw']->template->set_var('link_projects',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.list_projects&action=mains'));
-
$GLOBALS['phpgw']->template->set_var('link_archiv',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiprojects.archive&action=amains'));
+
$GLOBALS['phpgw']->template->set_var('link_budget',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uiprojects.list_budget','action'=>'mains')));
+
$GLOBALS['phpgw']->template->set_var('link_jobs',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uiprojects.list_projects','action'=>'subs')));
+
$GLOBALS['phpgw']->template->set_var('link_hours',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uiprojecthours.list_projects','action'=>'mains')));
+
$GLOBALS['phpgw']->template->set_var('link_ttracker',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uiprojecthours.ttracker')));
+
$GLOBALS['phpgw']->template->set_var('link_statistics',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uistatistics.list_projects','action'=>'mains')));
+
$GLOBALS['phpgw']->template->set_var('link_projects',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uiprojects.list_projects','action'=>'mains')));
+
$GLOBALS['phpgw']->template->set_var('link_archiv',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uiprojects.archive','action'=>'amains')));
$GLOBALS['phpgw']->template->fp('app_header','projects_header');
}
}
Index: class.uistatistics.inc.php
===================================================================
RCS file: /sources/phpgroupware/projects/inc/class.uistatistics.inc.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- class.uistatistics.inc.php 27 Nov 2006 21:52:57 -0000 1.65
+++ class.uistatistics.inc.php 29 Nov 2006 21:31:07 -0000 1.66
@@ -6,7 +6,7 @@
* @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package projects
- * @version $Id: class.uistatistics.inc.php,v 1.65 2006/11/27 21:52:57
sigurdne Exp $
+ * @version $Id: class.uistatistics.inc.php,v 1.66 2006/11/29 21:31:07
sigurdne Exp $
* $Source:
/sources/phpgroupware/projects/inc/class.uistatistics.inc.php,v $
*/
@@ -112,8 +112,8 @@
$gantt_user[$i] = $pro_id;
$i++;
}
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=projects.uistatistics.project_gantt&project_id='
-
. implode(',',$gantt_user));
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>'projects.uistatistics.project_gantt',
+
'project_id'=>implode(',',$gantt_user)));
}
else
{
@@ -390,8 +390,7 @@
// --------------- template declaration for list records
-------------------------------------
- /*$projects_url =
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uistatistics.list_project_employees&project_id='
- .
$pro[$i]['project_id']);
+ /*$projects_url =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uistatistics.list_project_employees','project_id'=>
$pro[$i]['project_id']));
*/
$projects_url =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'projects.uiprojecthours.list_hours',
'project_id'=>
$pro[$i]['project_id'],
@@ -925,7 +924,7 @@
if (! $project_id)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=projects.uistatistics.list_projects&action=mains');
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>'projects.uistatistics.list_projects','action'=>'mains'));
}
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . lang('project statistic');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] projects/inc class.uiprojecthours.inc.php class...,
Sigurd Nes <=