[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: projects/inc class.boprojecthours.inc.php, 1.8.2
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: projects/inc class.boprojecthours.inc.php, 1.8.2.1.2.3, 1.8.2.1.2.4 class.boprojects.inc.php, 1.42.2.5.2.24, 1.42.2.5.2.25 class.soprojects.inc.php, 1.34.2.6.2.26, 1.34.2.6.2.27 class.uiprojecthours.inc.php, 1.22.2.5.2.9, 1.22.2.5.2.10 |
|
Date: |
Sun, 24 Aug 2003 18:53:21 -0400 |
Update of /cvsroot/phpgroupware/projects/inc
In directory subversions:/tmp/cvs-serv13641/inc
Modified Files:
Tag: Version-0_9_16-branch
class.boprojecthours.inc.php class.boprojects.inc.php
class.soprojects.inc.php class.uiprojecthours.inc.php
Log Message:
update
Index: class.boprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojecthours.inc.php,v
retrieving revision 1.8.2.1.2.3
retrieving revision 1.8.2.1.2.4
diff -C2 -r1.8.2.1.2.3 -r1.8.2.1.2.4
*** class.boprojecthours.inc.php 20 Jun 2003 22:04:32 -0000
1.8.2.1.2.3
--- class.boprojecthours.inc.php 24 Aug 2003 22:53:18 -0000
1.8.2.1.2.4
***************
*** 56,65 ****
}
! $start = get_var('start',array('POST','GET'));
! $query = get_var('query',array('POST','GET'));
! $sort = get_var('sort',array('POST','GET'));
! $order = get_var('order',array('POST','GET'));
! $state = get_var('state',array('POST','GET'));
! $filter = get_var('filter',array('POST','GET'));
$project_id =
get_var('project_id',array('POST','GET'));
--- 56,65 ----
}
! $start = get_var('start',array('POST','GET'));
! $query = get_var('query',array('POST','GET'));
! $sort = get_var('sort',array('POST','GET'));
! $order = get_var('order',array('POST','GET'));
! $state = get_var('state',array('POST','GET'));
! $filter = get_var('filter',array('POST','GET'));
$project_id =
get_var('project_id',array('POST','GET'));
***************
*** 86,95 ****
$data =
$GLOBALS['phpgw']->session->appsession('session_data','projects_hours');
! $this->start = $data['start'];
! $this->query = $data['query'];
! $this->filter = $data['filter'];
! $this->order = $data['order'];
! $this->sort = $data['sort'];
! $this->state = $data['state'];
$this->project_id = $data['project_id'];
}
--- 86,95 ----
$data =
$GLOBALS['phpgw']->session->appsession('session_data','projects_hours');
! $this->start = $data['start'];
! $this->query = $data['query'];
! $this->filter = $data['filter'];
! $this->order = $data['order'];
! $this->sort = $data['sort'];
! $this->state = $data['state'];
$this->project_id = $data['project_id'];
}
***************
*** 106,109 ****
--- 106,114 ----
$hours =
$this->soprojecthours->read_single_hours($hours_id);
return $hours;
+ }
+
+ function member()
+ {
+ return $this->boprojects->member($this->project_id);
}
Index: class.boprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.boprojects.inc.php,v
retrieving revision 1.42.2.5.2.24
retrieving revision 1.42.2.5.2.25
diff -C2 -r1.42.2.5.2.24 -r1.42.2.5.2.25
*** class.boprojects.inc.php 23 Aug 2003 01:33:08 -0000 1.42.2.5.2.24
--- class.boprojects.inc.php 24 Aug 2003 22:53:19 -0000 1.42.2.5.2.25
***************
*** 956,959 ****
--- 956,964 ----
return $edateout;
}
+
+ function member($project_id = '')
+ {
+ return $this->so->member($project_id);
+ }
}
?>
Index: class.soprojects.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.soprojects.inc.php,v
retrieving revision 1.34.2.6.2.26
retrieving revision 1.34.2.6.2.27
diff -C2 -r1.34.2.6.2.26 -r1.34.2.6.2.27
*** class.soprojects.inc.php 23 Aug 2003 14:31:24 -0000 1.34.2.6.2.26
--- class.soprojects.inc.php 24 Aug 2003 22:53:19 -0000 1.34.2.6.2.27
***************
*** 1335,1338 ****
--- 1335,1355 ----
return $projects;
}
+
+ function member($project_id)
+ {
+ $this->db->query("SELECT acl_account from phpgw_acl
where acl_appname = 'projects' and acl_rights=7 and acl_location="
+ .
intval($project_id),__LINE__,__FILE__);
+
+ while($this->db->next_record())
+ {
+ $members[] = $this->db->f(0);
+ }
+
+ if (in_array($this->account,$members))
+ {
+ return True;
+ }
+ return False;
+ }
}
?>
Index: class.uiprojecthours.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/projects/inc/class.uiprojecthours.inc.php,v
retrieving revision 1.22.2.5.2.9
retrieving revision 1.22.2.5.2.10
diff -C2 -r1.22.2.5.2.9 -r1.22.2.5.2.10
*** class.uiprojecthours.inc.php 25 Jul 2003 23:00:37 -0000
1.22.2.5.2.9
--- class.uiprojecthours.inc.php 24 Aug 2003 22:53:19 -0000
1.22.2.5.2.10
***************
*** 343,355 ****
}
! if ($action != 'asubs')
{
! if
($this->boprojects->check_perms($this->grants[$coordinator],PHPGW_ACL_ADD) ||
$coordinator == $this->account)
! {
! $link_data['menuaction'] =
'projects.uiprojecthours.edit_hours';
! unset($link_data['hours_id']);
!
$GLOBALS['phpgw']->template->set_var('action','<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data)
!
. '"><input
type="submit" value="' . lang('Add') . '"></form>');
! }
}
else
--- 343,353 ----
}
! if ($action != 'asubs' &&
($this->boprojects->check_perms($this->grants[$coordinator],PHPGW_ACL_ADD) ||
$coordinator == $this->account
!
|| $this->bo->member()))
{
! $link_data['menuaction'] =
'projects.uiprojecthours.edit_hours';
! unset($link_data['hours_id']);
!
$GLOBALS['phpgw']->template->set_var('action','<form method="POST" action="' .
$GLOBALS['phpgw']->link('/index.php',$link_data)
!
. '"><input type="submit"
value="' . lang('Add') . '"></form>');
}
else
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: projects/inc class.boprojecthours.inc.php, 1.8.2.1.2.3, 1.8.2.1.2.4 class.boprojects.inc.php, 1.42.2.5.2.24, 1.42.2.5.2.25 class.soprojects.inc.php, 1.34.2.6.2.26, 1.34.2.6.2.27 class.uiprojecthours.inc.php, 1.22.2.5.2.9, 1.22.2.5.2.10,
Bettina Gille <address@hidden> <=