[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] projects/inc class.uiprojects.inc.php,1.80,1.81
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] projects/inc class.uiprojects.inc.php,1.80,1.81 |
|
Date: |
Wed, 03 Dec 2003 13:20:23 +0000 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv16054/inc
Modified Files:
class.uiprojects.inc.php
Log Message:
update
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** class.uiprojects.inc.php 1 Dec 2003 16:27:04 -0000 1.80
--- class.uiprojects.inc.php 3 Dec 2003 13:20:20 -0000 1.81
***************
*** 654,660 ****
$values =
get_var('values',array('POST'));
$link_data = array
(
! 'menuaction' =>
'projects.uiprojects.list_projects',
'pro_main' => $pro_main,
'action' => $action,
--- 654,667 ----
$values =
get_var('values',array('POST'));
+ switch($action)
+ {
+ case 'amains':
+ case 'asubs': $menu =
'projects.uiprojects.archive'; break;
+ default: $menu =
'projects.uiprojects.list_projects'; break;
+ }
+
$link_data = array
(
! 'menuaction' => $menu,
'pro_main' => $pro_main,
'action' => $action,
***************
*** 995,999 ****
if (isset($public_view))
{
! $menuaction =
'projects.uiprojects.list_projects_home';
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
--- 1002,1006 ----
if (isset($public_view))
{
! $menu =
'projects.uiprojects.list_projects_home';
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
***************
*** 1002,1006 ****
else
{
! $menuaction =
'projects.uiprojects.list_projects';
$this->display_app_header();
}
--- 1009,1018 ----
else
{
! switch($action)
! {
! case 'amains':
! case 'asubs': $menu =
'projects.uiprojects.archive'; break;
! default: $menu =
'projects.uiprojects.list_projects'; break;
! }
$this->display_app_header();
}
***************
*** 1008,1012 ****
$link_data = array
(
! 'menuaction' => $menuaction,
'pro_main' => $pro_main,
'action' => $action,
--- 1020,1024 ----
$link_data = array
(
! 'menuaction' => $menu,
'pro_main' => $pro_main,
'action' => $action,
***************
*** 1062,1066 ****
$GLOBALS['phpgw']->template->set_var('bill_activities_list',$billact_list);
! if ($action == 'mains')
{
$GLOBALS['phpgw']->template->set_var('investment_nr',$values['investment_nr']);
--- 1074,1078 ----
$GLOBALS['phpgw']->template->set_var('bill_activities_list',$billact_list);
! if ($action == 'mains' || $action == 'amains')
{
$GLOBALS['phpgw']->template->set_var('investment_nr',$values['investment_nr']);
***************
*** 1068,1072 ****
$GLOBALS['phpgw']->template->set_var('pcosts',$values['pcosts']);
}
! else if($pro_main && $action == 'subs')
{
$main =
$this->boprojects->read_single_project($pro_main);
--- 1080,1084 ----
$GLOBALS['phpgw']->template->set_var('pcosts',$values['pcosts']);
}
! else if($pro_main && ($action == 'subs' || $action ==
'asubs'))
{
$main =
$this->boprojects->read_single_project($pro_main);
***************
*** 1876,1891 ****
// --------------- template declaration for list records
-------------------------------------
$GLOBALS['phpgw']->template->set_var(array
(
! 'number' =>
$GLOBALS['phpgw']->strip_html($pro[$i]['number']),
! 'td_action' => $td_action,
! 'status' =>
lang($pro[$i]['status']),
! 'title' => $title,
! 'end_date' => $edateout,
! 'coordinator' =>
$pro[$i]['coordinatorout']
));
- $link_data['project_id'] =
$pro[$i]['project_id'];
-
if
($this->boprojects->check_perms($this->grants[$pro[$i]['coordinator']],PHPGW_ACL_EDIT)
|| $pro[$i]['coordinator'] == $this->account)
{
--- 1888,1907 ----
// --------------- template declaration for list records
-------------------------------------
+
+ $link_data['project_id'] =
$pro[$i]['project_id'];
+ $link_data['menuaction'] =
'projects.uiprojects.view_project';
+
$GLOBALS['phpgw']->template->set_var(array
(
! 'number' =>
$GLOBALS['phpgw']->strip_html($pro[$i]['number']),
! 'td_action' =>
$td_action,
! 'status' =>
lang($pro[$i]['status']),
! 'title' =>
$title,
! 'end_date' =>
$edateout,
! 'coordinator' =>
$pro[$i]['coordinatorout'],
! 'view' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
! 'lang_view_entry' => lang('view')
));
if
($this->boprojects->check_perms($this->grants[$pro[$i]['coordinator']],PHPGW_ACL_EDIT)
|| $pro[$i]['coordinator'] == $this->account)
{
***************
*** 1912,1930 ****
$GLOBALS['phpgw']->template->set_var('action_entry',$GLOBALS['phpgw']->link('/index.php',$link_data));
$GLOBALS['phpgw']->template->set_var('lang_action_entry',lang('Work hours'));
- }
-
- if ($this->boprojects->isprojectadmin('pbo'))
- {
-
$GLOBALS['phpgw']->template->set_var('delivery',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uideliveries.list_deliveries&project_id='
-
.
$pro[$i]['project_id'] . '&action=' . $action));
-
$GLOBALS['phpgw']->template->set_var('invoice',$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uibilling.list_invoices&project_id='
-
.
$pro[$i]['project_id'] . '&action=' . $action));
-
$GLOBALS['phpgw']->template->set_var('lang_invoice_entry',lang('Invoices'));
-
$GLOBALS['phpgw']->template->set_var('lang_delivery_entry',lang('Deliveries'));
- }
- else
- {
-
$GLOBALS['phpgw']->template->set_var('lang_invoice_entry',' ');
-
$GLOBALS['phpgw']->template->set_var('lang_delivery_entry',' ');
}
--- 1928,1931 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] projects/inc class.uiprojects.inc.php,1.80,1.81,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] bookkeeping/setup tables_update.inc.php, NONE, 1.1
- Next by Date:
[Phpgroupware-cvs] bookkeeping/templates/default bill_list.tpl, 1.1, 1.2 header.tpl, 1.1, 1.2
- Previous by thread:
[Phpgroupware-cvs] bookkeeping/setup tables_update.inc.php, NONE, 1.1
- Next by thread:
[Phpgroupware-cvs] bookkeeping/templates/default bill_list.tpl, 1.1, 1.2 header.tpl, 1.1, 1.2
- Index(es):