[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: projects/inc class.soprojects.inc.php, 1.34.2.6.
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: projects/inc class.soprojects.inc.php, 1.34.2.6.2.20, 1.34.2.6.2.21 class.uiprojects.inc.php, 1.47.2.7.2.22, 1.47.2.7.2.23 |
|
Date: |
Thu, 24 Jul 2003 22:12:40 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv17324/inc
Modified Files:
Tag: Version-0_9_16-branch
class.soprojects.inc.php class.uiprojects.inc.php
Log Message:
update
Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.34.2.6.2.20
retrieving revision 1.34.2.6.2.21
diff -C2 -r1.34.2.6.2.20 -r1.34.2.6.2.21
*** class.soprojects.inc.php 25 Jul 2003 01:09:39 -0000 1.34.2.6.2.20
--- class.soprojects.inc.php 25 Jul 2003 02:12:37 -0000 1.34.2.6.2.21
***************
*** 105,108 ****
--- 105,109 ----
$sort =
(isset($values['sort'])?$values['sort']:'ASC');
$order = $values['order'];
+ $status = $values['status'];
$type =
(isset($values['type'])?$values['type']:'mains');
***************
*** 440,444 ****
if (isset($values['old_parent']) &&
$values['old_parent'] != $values['parent'])
{
! $this->reparent($values);
}
if (!isset($values['main']) || !isset($values['level']))
--- 441,445 ----
if (isset($values['old_parent']) &&
$values['old_parent'] != $values['parent'])
{
! //$this->reparent($values, $book_activities,
$bill_activities);
}
if (!isset($values['main']) || !isset($values['level']))
Index: class.uiprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojects.inc.php,v
retrieving revision 1.47.2.7.2.22
retrieving revision 1.47.2.7.2.23
diff -C2 -r1.47.2.7.2.22 -r1.47.2.7.2.23
*** class.uiprojects.inc.php 25 Jul 2003 01:09:39 -0000 1.47.2.7.2.22
--- class.uiprojects.inc.php 25 Jul 2003 02:12:37 -0000 1.47.2.7.2.23
***************
*** 667,672 ****
$main =
$this->bo->read_single_project($pro_main);
!
$GLOBALS['phpgw']->template->set_var('parent_select',$this->bo->select_project_list(array('type'
=> 'mainandsubs','status' => $values['status'],'self' => $project_id,
!
'selected' =>
$values['parent'],'main' => $pro_main)));
$GLOBALS['phpgw']->template->set_var('pro_main',$GLOBALS['phpgw']->strip_html($main['number'])
. ' ' . $GLOBALS['phpgw']->strip_html($main['title']));
--- 667,675 ----
$main =
$this->bo->read_single_project($pro_main);
!
$GLOBALS['phpgw']->template->set_var('parent_select','<select
name="values[parent]">' . $this->bo->select_project_list(array('type' =>
'mainandsubs',
!
'status' => $values['status'],
!
'self' => $project_id,
!
'selected' => $values['parent'],
!
'main' => $pro_main)) .
'</select>');
$GLOBALS['phpgw']->template->set_var('pro_main',$GLOBALS['phpgw']->strip_html($main['number'])
. ' ' . $GLOBALS['phpgw']->strip_html($main['title']));
***************
*** 750,759 ****
(
'menuaction' =>
'projects.uiprojects.list_projects',
! 'pro_parent' => $pro_parent,
'action' => $action,
'project_id' => $project_id
);
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_parent?lang('view job'):lang('view project'));
$this->display_app_header();
--- 753,762 ----
(
'menuaction' =>
'projects.uiprojects.list_projects',
! 'pro_main' => $pro_main,
'action' => $action,
'project_id' => $project_id
);
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_main?lang('view job'):lang('view project'));
$this->display_app_header();
***************
*** 809,823 ****
else
{
! if ($pro_parent && $action == 'subs')
{
! $parent =
$this->bo->read_single_project($pro_parent);
!
$GLOBALS['phpgw']->template->set_var('pro_parent',$GLOBALS['phpgw']->strip_html($parent['number'])
. ' ' . $GLOBALS['phpgw']->strip_html($parent['title']));
!
$GLOBALS['phpgw']->template->set_var('cat',$this->bo->cats->id2name($parent['cat']));
!
$GLOBALS['phpgw']->template->set_var('investment_nr',($parent['investment_nr']?$parent['investment_nr']:' '));
$GLOBALS['phpgw']->template->set_var('pcosts',$parent['pcosts']);
}
$GLOBALS['phpgw']->template->set_var('lang_number',lang('Job ID'));
!
$GLOBALS['phpgw']->template->set_var('lang_parent',lang('Main project'));
}
--- 812,829 ----
else
{
! if ($pro_main && $action == 'subs')
{
! $main =
$this->bo->read_single_project($pro_main);
!
$GLOBALS['phpgw']->template->set_var('pro_main',$GLOBALS['phpgw']->strip_html($main['number'])
. ' ' . $GLOBALS['phpgw']->strip_html($main['title']));
!
$GLOBALS['phpgw']->template->set_var('cat',$this->bo->cats->id2name($main['cat']));
!
$GLOBALS['phpgw']->template->set_var('investment_nr',($main['investment_nr']?$main['investment_nr']:' '));
$GLOBALS['phpgw']->template->set_var('pcosts',$parent['pcosts']);
}
$GLOBALS['phpgw']->template->set_var('lang_number',lang('Job ID'));
!
$GLOBALS['phpgw']->template->set_var('lang_main',lang('Main project'));
!
!
//$GLOBALS['phpgw']->template->set_var('pro_parent',$GLOBALS['phpgw']->strip_html($main['number'])
. ' ' . $GLOBALS['phpgw']->strip_html($main['title']));
!
$GLOBALS['phpgw']->template->set_var('lang_parent',lang('Parent project'));
}
***************
*** 1560,1564 ****
{
$action = get_var('action',array('POST','GET'));
! $pro_parent =
get_var('pro_parent',array('POST','GET'));
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . (($action == 'amains')?lang('project
archive'):lang('job archive'));
--- 1566,1570 ----
{
$action = get_var('action',array('POST','GET'));
! $pro_main =
get_var('pro_main',array('POST','GET'));
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . (($action == 'amains')?lang('project
archive'):lang('job archive'));
***************
*** 1576,1589 ****
(
'menuaction' =>
'projects.uiprojects.archive',
! 'pro_parent' => $pro_parent,
'action' => $action,
'cat_id' => $this->cat_id
);
- if (!$this->start)
- {
- $this->start = 0;
- }
-
if (!$pro_parent)
{
--- 1582,1590 ----
(
'menuaction' =>
'projects.uiprojects.archive',
! 'pro_main' => $pro_main,
'action' => $action,
'cat_id' => $this->cat_id
);
if (!$pro_parent)
{
***************
*** 1591,1595 ****
}
! $pro =
$this->bo->list_projects($this->start,True,$this->query,$this->filter,$this->sort,$this->order,'archive',$this->cat_id,$action,$pro_parent);
// --------------------- nextmatch variable template-declarations
------------------------
--- 1592,1597 ----
}
! $this->bo->status = 'archive';
! $pro = $this->bo->list_projects($action,$pro_main);
// --------------------- nextmatch variable template-declarations
------------------------
***************
*** 1615,1619 ****
$action_list= '<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data) .'" name="form">' . "\n"
. '<select
name="pro_parent" onChange="this.form.submit();"><option value="">' .
lang('Select main project') . '</option>' . "\n"
! .
$this->bo->select_project_list('mains', 'archive', $pro_parent) . '</select>';
$GLOBALS['phpgw']->template->set_var('lang_action',lang('Work hours'));
}
--- 1617,1621 ----
$action_list= '<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data) .'" name="form">' . "\n"
. '<select
name="pro_parent" onChange="this.form.submit();"><option value="">' .
lang('Select main project') . '</option>' . "\n"
! .
$this->bo->select_project_list(array('status' => 'archive','selected' =>
$pro_main)) . '</select>';
$GLOBALS['phpgw']->template->set_var('lang_action',lang('Work hours'));
}
***************
*** 1741,1745 ****
{
$action = get_var('action',array('POST','GET'));
! $pro_parent = get_var('pro_parent',array('POST','GET'));
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_parent?lang('list budget'):lang('list budget'));
--- 1743,1747 ----
{
$action = get_var('action',array('POST','GET'));
! $pro_main =
get_var('pro_main',array('POST','GET'));
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('projects') . ': ' . ($pro_parent?lang('list budget'):lang('list budget'));
***************
*** 1769,1787 ****
(
'menuaction' =>
'projects.uiprojects.list_budget',
! 'pro_parent' => $pro_parent,
'action' => $action
);
! if (! $this->status)
! {
! $this->status = 'active';
! }
!
! if (!$pro_parent)
{
! $pro_parent = 0;
}
! $pro =
$this->bo->list_projects($this->start,True,$this->query,$this->filter,$this->sort,$this->order,$this->status,$this->cat_id,$action,$pro_parent);
// --------------------- nextmatch variable template-declarations
------------------------
--- 1771,1784 ----
(
'menuaction' =>
'projects.uiprojects.list_budget',
! 'pro_main' => $pro_main,
'action' => $action
);
! if (!$pro_main)
{
! $pro_main = 0;
}
! $pro = $this->bo->list_projects($action,$pro_main);
// --------------------- nextmatch variable template-declarations
------------------------
***************
*** 1807,1811 ****
$action_list= '<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data) .'" name="form">' . "\n"
. '<select
name="pro_parent" onChange="this.form.submit();"><option value="">' .
lang('Select main project') . '</option>' . "\n"
! .
$this->bo->select_project_list('mains', $status, $pro_parent) . '</select>';
$GLOBALS['phpgw']->template->set_var('lang_action',lang('Work hours'));
}
--- 1804,1808 ----
$action_list= '<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data) .'" name="form">' . "\n"
. '<select
name="pro_parent" onChange="this.form.submit();"><option value="">' .
lang('Select main project') . '</option>' . "\n"
! .
$this->bo->select_project_list(array('status' => $this->status, 'selected' =>
$pro_main)) . '</select>';
$GLOBALS['phpgw']->template->set_var('lang_action',lang('Work hours'));
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.soprojects.inc.php, 1.34.2.6.2.20, 1.34.2.6.2.21 class.uiprojects.inc.php, 1.47.2.7.2.22, 1.47.2.7.2.23,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: projects/setup phpgw_de.lang, 1.17.2.4.2.12, 1.17.2.4.2.13
- Next by Date:
[Phpgroupware-cvs] CVS: projects/setup phpgw_de.lang, 1.17.2.4.2.13, 1.17.2.4.2.14 setup.inc.php, 1.11.2.2.2.4, 1.11.2.2.2.5 tables_current.inc.php, 1.11.2.1.2.5, 1.11.2.1.2.6 tables_update.inc.php, 1.15.2.1.2.5, 1.15.2.1.2.6
- Previous by thread:
[Phpgroupware-cvs] CVS: projects/setup phpgw_de.lang, 1.17.2.4.2.12, 1.17.2.4.2.13
- Next by thread:
[Phpgroupware-cvs] CVS: projects/setup phpgw_de.lang, 1.17.2.4.2.13, 1.17.2.4.2.14 setup.inc.php, 1.11.2.2.2.4, 1.11.2.2.2.5 tables_current.inc.php, 1.11.2.1.2.5, 1.11.2.1.2.6 tables_update.inc.php, 1.15.2.1.2.5, 1.15.2.1.2.6
- Index(es):