[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bocategory.inc.php,1.3,1.4 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bocategory.inc.php,1.3,1.4 class.bocommon.inc.php,1.65,1.66 class.bodocument.inc.php,1.8,1.9 class.borequest.inc.php,1.7,1.8 class.socategory.inc.php,1.5,1.6 class.sodocument.inc.php,1.10,1.11 class.soequipment.inc.php,1.20,1.21 class.someter.inc.php,1.6,1.7 class.sotenant.inc.php,1.3,1.4class.uiadmin_location.inc.php,1.5,1.6 class.uicategory.inc.php,1.5,1.6 class.uidocument.inc.php,1.13,1.14 class.uidrawing.inc.php,1.21,1.22 class.uigab.inc.php,1.8,1.9 class.uiowner.inc.php,1.8,1.9 class.uiproject.inc.php,1.33,1.34 class.uirequest.inc.php,1.22,1.23 class.uitenant.inc.php,1.2,1.3 class.uitts.inc.php,1.31,1.32 class.uiworkorder.inc.php,1.26,1.27 class.uiXport.inc.php,1.29,1.30 hook_admin.inc.php,1.37,1.38 |
|
Date: |
Mon, 30 Jun 2003 06:49:17 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv29538/inc
Modified Files:
class.bocategory.inc.php class.bocommon.inc.php
class.bodocument.inc.php class.borequest.inc.php
class.socategory.inc.php class.sodocument.inc.php
class.soequipment.inc.php class.someter.inc.php
class.sotenant.inc.php class.uiadmin_location.inc.php
class.uicategory.inc.php class.uidocument.inc.php
class.uidrawing.inc.php class.uigab.inc.php
class.uiowner.inc.php class.uiproject.inc.php
class.uirequest.inc.php class.uitenant.inc.php
class.uitts.inc.php class.uiworkorder.inc.php
class.uiXport.inc.php hook_admin.inc.php
Log Message:
no message
Index: class.bocategory.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocategory.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.bocategory.inc.php 23 May 2003 08:40:19 -0000 1.3
--- class.bocategory.inc.php 30 Jun 2003 10:49:14 -0000 1.4
***************
*** 124,131 ****
! function read($type='')
{
$category = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'type' => $type,'allrows'=>$this->allrows));
$this->total_records = $this->so->total_records;
--- 124,131 ----
! function read($type='',$type_id='')
{
$category = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'type' => $type,type_id=>$type_id,'allrows'=>$this->allrows));
$this->total_records = $this->so->total_records;
***************
*** 134,140 ****
}
! function read_single($id,$type)
{
! return $this->so->read_single($id,$type);
}
--- 134,140 ----
}
! function read_single($id,$type,$type_id)
{
! return $this->so->read_single($id,$type,$type_id);
}
***************
*** 144,148 ****
}
! function save($category,$action='',$type ='')
{
if ($action=='edit')
--- 144,148 ----
}
! function save($category,$action='',$type ='',$type_id)
{
if ($action=='edit')
***************
*** 151,160 ****
{
! $receipt =
$this->so->edit($category,$type);
}
}
else
{
! $receipt = $this->so->add($category,$type);
}
--- 151,160 ----
{
! $receipt =
$this->so->edit($category,$type,$type_id);
}
}
else
{
! $receipt =
$this->so->add($category,$type,$type_id);
}
***************
*** 162,168 ****
}
! function delete($id,$type)
{
! $this->so->delete($id,$type);
}
}
--- 162,168 ----
}
! function delete($id,$type,$type_id)
{
! $this->so->delete($id,$type,$type_id);
}
}
Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -r1.65 -r1.66
*** class.bocommon.inc.php 28 Jun 2003 17:57:57 -0000 1.65
--- class.bocommon.inc.php 30 Jun 2003 10:49:14 -0000 1.66
***************
*** 499,505 ****
$menu['sub_invoice_investment_value']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvestment.index');
$menu['sublang_invoice_investment_value']=lang('Investment value');
!
$menu['sub_invoice_import']=$GLOBALS['phpgw']->link('/index.php','menuaction=property.uiXport.import');
$menu['sublang_invoice_import']=lang('Import invoice');
!
$menu['sub_invoice_export']=$GLOBALS['phpgw']->link('/index.php','menuaction=property.uiXport.export');
$menu['sublang_invoice_export']=lang('Export invoice');
}
--- 499,505 ----
$menu['sub_invoice_investment_value']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvestment.index');
$menu['sublang_invoice_investment_value']=lang('Investment value');
!
$menu['sub_invoice_import']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiXport.import');
$menu['sublang_invoice_import']=lang('Import invoice');
!
$menu['sub_invoice_export']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiXport.export');
$menu['sublang_invoice_export']=lang('Export invoice');
}
***************
*** 541,549 ****
$menu['sub_menu'][$i]['statustext']
= lang('Workorder template');
- if($this->acl2->check('.project',16))
- {
-
$menu['sub_workorder_event']=$GLOBALS['phpgw']->link('/property/list_event.php','sub=workorder');
-
$menu['sublang_workorder_event']=lang('Event');
- }
}
--- 541,544 ----
Index: class.bodocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bodocument.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.bodocument.inc.php 26 Jun 2003 12:23:05 -0000 1.8
--- class.bodocument.inc.php 30 Jun 2003 10:49:14 -0000 1.9
***************
*** 457,460 ****
--- 457,461 ----
function create_document_dir($loc1='',$equipment_id='')
{
+ //_debug_array($loc1);
if(!$this->vfs->file_exists(array(
'string' => $this->fakebase. SEP .
'document' . SEP . $loc1,
Index: class.borequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.borequest.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.borequest.inc.php 23 Jun 2003 12:26:43 -0000 1.7
--- class.borequest.inc.php 30 Jun 2003 10:49:14 -0000 1.8
***************
*** 112,116 ****
else
{
!
$selected=$GLOBALS['phpgw_info']['user']['preferences']['property'][$degreedefault_type];
}
--- 112,116 ----
else
{
!
$selected=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp][$degreedefault_type];
}
***************
*** 160,164 ****
else
{
!
$selected=$GLOBALS['phpgw_info']['user']['preferences']['property'][$consequencedefault_type];
}
--- 160,164 ----
else
{
!
$selected=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp][$consequencedefault_type];
}
Index: class.socategory.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socategory.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.socategory.inc.php 29 Jun 2003 10:12:52 -0000 1.5
--- class.socategory.inc.php 30 Jun 2003 10:49:14 -0000 1.6
***************
*** 39,46 ****
$sort =
(isset($data['sort'])?$data['sort']:'DESC');
$order =
(isset($data['order'])?$data['order']:'');
! $type =
(isset($data['type'])?$data['type']:0);
$allrows =
(isset($data['allrows'])?$data['allrows']:'');
}
if ($order)
{
--- 39,51 ----
$sort =
(isset($data['sort'])?$data['sort']:'DESC');
$order =
(isset($data['order'])?$data['order']:'');
! $type =
(isset($data['type'])?$data['type']:'');
! $type_id =
(isset($data['type_id'])?$data['type_id']:'');
$allrows =
(isset($data['allrows'])?$data['allrows']:'');
}
+ if(!$type)
+ {
+ return;
+ }
if ($order)
{
***************
*** 53,57 ****
}
! $table = $this->select_table($type);
if($query)
--- 58,62 ----
}
! $table = $this->select_table($type,$type_id);
if($query)
***************
*** 89,93 ****
! function select_table($type)
{
--- 94,98 ----
! function select_table($type,$type_id)
{
***************
*** 109,123 ****
$table='fm_workorder_category';
break;
! case 'property':
! $table='fm_property_category';
! break;
! case 'building':
! $table='fm_building_category';
! break;
! case 'entrance':
! $table='fm_entrance_category';
! break;
! case 'apartment':
! $table='fm_apartment_category';
break;
case 'drawing':
--- 114,119 ----
$table='fm_workorder_category';
break;
! case 'location':
! $table='fm_location' . $type_id .
'_category';
break;
case 'drawing':
***************
*** 139,146 ****
! function read_single($id,$type)
{
! $table = $this->select_table($type);
$sql = "SELECT * FROM $table where id='$id'";
--- 135,142 ----
! function read_single($id,$type,$type_id)
{
! $table = $this->select_table($type,$type_id);
$sql = "SELECT * FROM $table where id='$id'";
***************
*** 157,163 ****
}
! function add($category,$type)
{
! $table = $this->select_table($type);
$category['descr'] =
$this->db->db_addslashes($category['descr']);
--- 153,159 ----
}
! function add($category,$type,$type_id)
{
! $table = $this->select_table($type,$type_id);
$category['descr'] =
$this->db->db_addslashes($category['descr']);
***************
*** 170,177 ****
}
! function edit($category,$type)
{
! $table = $this->select_table($type);
$category['descr'] =
$this->db->db_addslashes($category['descr']);
--- 166,173 ----
}
! function edit($category,$type,$type_id)
{
! $table = $this->select_table($type,$type_id);
$category['descr'] =
$this->db->db_addslashes($category['descr']);
***************
*** 185,191 ****
}
! function delete($id,$type)
{
! $table = $this->select_table($type);
$this->db->query("DELETE FROM $table WHERE id='" . $id
. "'",__LINE__,__FILE__);
--- 181,187 ----
}
! function delete($id,$type,$type_id)
{
! $table = $this->select_table($type,$type_id);
$this->db->query("DELETE FROM $table WHERE id='" . $id
. "'",__LINE__,__FILE__);
Index: class.sodocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sodocument.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.sodocument.inc.php 29 Jun 2003 10:12:52 -0000 1.10
--- class.sodocument.inc.php 30 Jun 2003 10:49:14 -0000 1.11
***************
*** 103,109 ****
$cols_return[] = 'location_code';
! $cols .= ",$entity_table.id as document_id";
! $cols_return[] = 'document_id';
if ($cat_id == 'equipment')
--- 103,110 ----
$cols_return[] = 'location_code';
! // $cols .= ",$entity_table.id as document_id";
! // $cols_return[] = 'document_id';
+ $groupmethod= " GROUP BY
fm_document.location_code,fm_document.address ";
if ($cat_id == 'equipment')
***************
*** 128,131 ****
--- 129,133 ----
$paranthesis .='(';
+ $groupmethod.= "
,fm_equipment_type.name,fm_document.equipment_id ";
}
***************
*** 136,144 ****
if ($order)
{
! $ordermethod = " order by $order $sort";
}
else
{
! $ordermethod = ' order by location_code ASC';
}
$filtermethod = ' ( fm_document.user_id=' .
$this->account;
--- 138,146 ----
if ($order)
{
! $ordermethod = " order by fm_document.$order
$sort";
}
else
{
! $ordermethod = ' order by
fm_document.location_code ASC';
}
$filtermethod = ' ( fm_document.user_id=' .
$this->account;
***************
*** 190,194 ****
}
- $groupmethod= " GROUP BY
fm_document.location_code,fm_document.equipment_id ";
$sql .= " WHERE $filtermethod $querymethod
$groupmethod";
--- 192,195 ----
Index: class.soequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soequipment.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** class.soequipment.inc.php 24 Jun 2003 13:07:40 -0000 1.20
--- class.soequipment.inc.php 30 Jun 2003 10:49:14 -0000 1.21
***************
*** 21,24 ****
--- 21,25 ----
$this->join = $this->socommon->join;
+ $this->left_join = $this->socommon->left_join;
}
***************
*** 218,222 ****
{
$sql = "SELECT location_code,equipment_type_id,
descr,lifetime, org_name,vendor_id , e.status as status, e.date as date,cost
from "
! . " fm_equipment as e $this->join phpgw_addressbook as
a on e.vendor_id=a.id where equipment_id='$equipment_id'";
$this->db->query($sql,__LINE__,__FILE__);
--- 219,223 ----
{
$sql = "SELECT location_code,equipment_type_id,
descr,lifetime, org_name,vendor_id , e.status as status, e.date as date,cost
from "
! . " fm_equipment as e $this->left_join
phpgw_addressbook as a on e.vendor_id=a.id where equipment_id='$equipment_id'";
$this->db->query($sql,__LINE__,__FILE__);
***************
*** 283,287 ****
{
! /* while (is_array($equipment['location']) &&
list($input_name,$value) = each($equipment['location']))
{
if($value)
--- 284,288 ----
{
! while (is_array($equipment['location']) &&
list($input_name,$value) = each($equipment['location']))
{
if($value)
***************
*** 292,296 ****
}
! */
while (is_array($equipment['extra']) &&
list($input_name,$value) = each($equipment['extra']))
{
--- 293,297 ----
}
!
while (is_array($equipment['extra']) &&
list($input_name,$value) = each($equipment['extra']))
{
***************
*** 346,354 ****
//_debug_array($equipment);
! /* while (is_array($equipment['location']) &&
list($input_name,$value) = each($equipment['location']))
{
$vals[] = "$input_name = '$value'";
}
! */
while (is_array($equipment['extra']) &&
list($input_name,$value) = each($equipment['extra']))
{
--- 347,355 ----
//_debug_array($equipment);
! while (is_array($equipment['location']) &&
list($input_name,$value) = each($equipment['location']))
{
$vals[] = "$input_name = '$value'";
}
!
while (is_array($equipment['extra']) &&
list($input_name,$value) = each($equipment['extra']))
{
Index: class.someter.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.someter.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.someter.inc.php 25 Jun 2003 18:27:48 -0000 1.6
--- class.someter.inc.php 30 Jun 2003 10:49:14 -0000 1.7
***************
*** 112,120 ****
if ($order)
{
! $ordermethod = " order by $order $sort";
}
else
{
! $ordermethod = ' order by location_code asc';
}
--- 112,120 ----
if ($order)
{
! $ordermethod = " order by $entity_table.$order
$sort";
}
else
{
! $ordermethod = " order by
$entity_table.location_code asc";
}
Index: class.sotenant.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotenant.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.sotenant.inc.php 21 Jun 2003 19:27:35 -0000 1.3
--- class.sotenant.inc.php 30 Jun 2003 10:49:14 -0000 1.4
***************
*** 17,21 ****
$this->db = $GLOBALS['phpgw']->db;
$this->db2 = $this->db;
- $this->grants =
$GLOBALS['phpgw']->acl->get_grants('property');
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
$this->socommon =
CreateObject($this->currentapp.'.socommon');
--- 17,20 ----
Index: class.uiadmin_location.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiadmin_location.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uiadmin_location.inc.php 28 Jun 2003 20:29:53 -0000 1.5
--- class.uiadmin_location.inc.php 30 Jun 2003 10:49:14 -0000 1.6
***************
*** 84,94 ****
'prefix'
=> $standard['prefix'],
'first'
=> $first,
'link_attribute'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_location.list_attribute&type_id='
. $standard['id']),
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_location.edit&id='
. $standard['id']),
'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_location.delete&id='
. $standard['id']),
'lang_view_standardtext' =>
lang('view the standard'),
! 'lang_attribute_standardtext' =>
lang('attributes for the standard'). ' ' . lang('location'),
'lang_edit_standardtext' =>
lang('edit the standard'),
'lang_delete_standardtext' =>
lang('delete the standard'),
'text_attribute'
=> lang('Attributes'),
'text_edit'
=> lang('edit'),
--- 84,97 ----
'prefix'
=> $standard['prefix'],
'first'
=> $first,
+ 'link_categories'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.index&type=location&type_id='
. $standard['id']),
'link_attribute'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_location.list_attribute&type_id='
. $standard['id']),
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_location.edit&id='
. $standard['id']),
'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiadmin_location.delete&id='
. $standard['id']),
'lang_view_standardtext' =>
lang('view the standard'),
! 'lang_category_text' =>
lang('categories for the location type'),
! 'lang_attribute_standardtext' =>
lang('attributes for the location type'),
'lang_edit_standardtext' =>
lang('edit the standard'),
'lang_delete_standardtext' =>
lang('delete the standard'),
+ 'text_categories'
=> lang('Categories'),
'text_attribute'
=> lang('Attributes'),
'text_edit'
=> lang('edit'),
***************
*** 104,107 ****
--- 107,111 ----
'lang_descr' => lang('Descr'),
'lang_prefix' => lang('prefix'),
+ 'lang_categories' => lang('Categories'),
'lang_attribute' => lang('Attributes'),
'lang_edit' => lang('edit'),
Index: class.uicategory.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uicategory.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uicategory.inc.php 29 Jun 2003 10:12:52 -0000 1.5
--- class.uicategory.inc.php 30 Jun 2003 10:49:14 -0000 1.6
***************
*** 60,68 ****
{
$type = get_var('type',array('POST','GET'));
$GLOBALS['phpgw']->xslttpl->add_file(array('category','nextmatchs',
'search_field'));
! $category_list = $this->bo->read($type);
while (is_array($category_list) && list(,$category) =
each($category_list))
--- 60,69 ----
{
$type = get_var('type',array('POST','GET'));
+ $type_id =
get_var('type_id',array('POST','GET'));
$GLOBALS['phpgw']->xslttpl->add_file(array('category','nextmatchs',
'search_field'));
! $category_list = $this->bo->read($type,$type_id);
while (is_array($category_list) && list(,$category) =
each($category_list))
***************
*** 75,80 ****
'id'
=> $category['id'],
'first'
=> $first,
! 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.edit&id='
. $category['id'].'&type='.$type),
! 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.delete&id='
. $category['id'].'&type='.$type),
'lang_view_categorytext' =>
lang('view the category'),
'lang_edit_categorytext' =>
lang('edit the category'),
--- 76,81 ----
'id'
=> $category['id'],
'first'
=> $first,
! 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.edit&id='
. $category['id'].'&type='.$type . '&type_id=' . $type_id),
! 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.delete&id='
. $category['id'].'&type='.$type . '&type_id=' . $type_id),
'lang_view_categorytext' =>
lang('view the category'),
'lang_edit_categorytext' =>
lang('edit the category'),
***************
*** 100,104 ****
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uicategory.index',
!
'type' =>$type)
)),
'lang_id' => lang('category id'),
--- 101,106 ----
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uicategory.index',
!
'type' =>$type,
!
'type_id' => $type_id)
)),
'lang_id' => lang('category id'),
***************
*** 109,113 ****
'lang_add' =>
lang('add'),
'lang_add_categorytext' => lang('add a
category'),
! 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.edit&type='.$type),
'lang_done' =>
lang('done'),
'lang_done_categorytext' => lang('back
to admin'),
--- 111,115 ----
'lang_add' =>
lang('add'),
'lang_add_categorytext' => lang('add a
category'),
! 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.edit&type='.$type
. '&type_id=' . $type_id),
'lang_done' =>
lang('done'),
'lang_done_categorytext' => lang('back
to admin'),
***************
*** 133,137 ****
'num_records'
=> count($category_list),
'all_records'
=> $this->bo->total_records,
! 'link_url'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.index&type='.$type),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
'lang_searchfield_categorytext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
--- 135,139 ----
'num_records'
=> count($category_list),
'all_records'
=> $this->bo->total_records,
! 'link_url'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.index&type='.$type
. '&type_id=' . $type_id),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi'),
'lang_searchfield_categorytext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
***************
*** 144,149 ****
);
! $appname
= lang($type);
! $function_msg =
lang('list '.$type.' category');
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
--- 146,152 ----
);
! $appname
= lang($type). ' ' . $type_id;
! ;
! $function_msg =
lang('list %1 category',$type);
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
***************
*** 155,161 ****
--- 158,166 ----
{
$type = get_var('type',array('POST','GET'));
+ $type_id =
get_var('type_id',array('POST','GET'));
$id = get_var('id',array('POST','GET'));
$values =
get_var('values',array('POST'));
+
$GLOBALS['phpgw']->xslttpl->add_file(array('category'));
***************
*** 180,184 ****
if(!$receipt['error'])
{
! $receipt =
$this->bo->save($values,$action,$type);
}
}
--- 185,189 ----
if(!$receipt['error'])
{
! $receipt =
$this->bo->save($values,$action,$type,$type_id);
}
}
***************
*** 186,190 ****
if ($id)
{
! $category = $this->bo->read_single($id,$type);
$function_msg = lang('edit category');
$action='edit';
--- 191,195 ----
if ($id)
{
! $category =
$this->bo->read_single($id,$type,$type_id);
$function_msg = lang('edit category');
$action='edit';
***************
*** 201,205 ****
'menuaction' =>
$this->currentapp.'.uicategory.edit',
'id' => $id,
! 'type' => $type
);
//_debug_array($link_data);
--- 206,211 ----
'menuaction' =>
$this->currentapp.'.uicategory.edit',
'id' => $id,
! 'type' => $type,
! 'type_id' => $type_id
);
//_debug_array($link_data);
***************
*** 211,215 ****
'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.index&type='.$type),
'lang_id' =>
lang('category ID'),
'lang_descr'
=> lang('Descr'),
--- 217,221 ----
'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.index&type='.$type
. '&type_id=' . $type_id),
'lang_id' =>
lang('category ID'),
'lang_descr'
=> lang('Descr'),
***************
*** 225,229 ****
);
! $appname
= lang($type);
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
--- 231,235 ----
);
! $appname
= lang($type). ' ' . $type_id;
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
***************
*** 234,237 ****
--- 240,244 ----
{
$type = get_var('type',array('POST','GET'));
+ $type_id =
get_var('type_id',array('POST','GET'));
$id = get_var('id',array('POST','GET'));
$confirm =
get_var('confirm',array('POST'));
***************
*** 240,249 ****
(
'menuaction' =>
$this->currentapp.'.uicategory.index',
! 'type' => $type
);
if (get_var('confirm',array('POST')))
{
! $this->bo->delete($id,$type);
Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
}
--- 247,257 ----
(
'menuaction' =>
$this->currentapp.'.uicategory.index',
! 'type' => $type,
! 'type_id' => $type_id
);
if (get_var('confirm',array('POST')))
{
! $this->bo->delete($id,$type,$type_id);
Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
}
***************
*** 254,258 ****
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
! 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.delete&id='
. $id.'&type='.$type),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
--- 262,266 ----
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
! 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.delete&id='
. $id.'&type='.$type . '&type_id=' . $type_id),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
***************
*** 262,266 ****
);
! $appname
= lang($type);
$function_msg =
lang('delete '.$type.' category');
--- 270,274 ----
);
! $appname
= lang($type). ' ' . $type_id;
$function_msg =
lang('delete '.$type.' category');
Index: class.uidocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidocument.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.uidocument.inc.php 27 Jun 2003 11:14:51 -0000 1.13
--- class.uidocument.inc.php 30 Jun 2003 10:49:14 -0000 1.14
***************
*** 568,571 ****
--- 568,573 ----
$from =
get_var('from',array('POST','GET'));
$document_id =
get_var('document_id',array('POST','GET'));
+ $location_code =
get_var('location_code',array('POST','GET'));
+ $equipment_id =
get_var('equipment_id',array('POST','GET'));
$values =
get_var('values',array('POST'));
$insert_record =
$GLOBALS['phpgw']->session->appsession('insert_record',$this->currentapp);
***************
*** 580,583 ****
--- 582,592 ----
//_debug_array($values);
+
+ if(!$document_id && $location_code && !$values)
+ {
+ $values['location_data'] =
$this->bolocation->read_single($location_code,array('equipment_id'=>$equipment_id));
+
+ }
+
if ($values['save'])
Index: class.uidrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidrawing.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** class.uidrawing.inc.php 27 Jun 2003 11:14:51 -0000 1.21
--- class.uidrawing.inc.php 30 Jun 2003 10:49:14 -0000 1.22
***************
*** 57,61 ****
$this->status_id =
$this->bo->status_id;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'property');
}
--- 57,61 ----
$this->status_id =
$this->bo->status_id;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'location');
}
Index: class.uigab.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uigab.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.uigab.inc.php 27 Jun 2003 19:06:11 -0000 1.8
--- class.uigab.inc.php 30 Jun 2003 10:49:14 -0000 1.9
***************
*** 55,59 ****
$this->allrows =
$this->bo->allrows;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'property');
}
--- 55,59 ----
$this->allrows =
$this->bo->allrows;
!
$GLOBALS['phpgw']->session->appsession('sub',$this->currentapp,'location');
}
Index: class.uiowner.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiowner.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.uiowner.inc.php 3 Jun 2003 10:24:00 -0000 1.8
--- class.uiowner.inc.php 30 Jun 2003 10:49:14 -0000 1.9
***************
*** 33,38 ****
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
- $this->grants =
$GLOBALS['phpgw']->acl->get_grants('property');
- $this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
$this->bo =
CreateObject($this->currentapp.'.boowner',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
--- 33,36 ----
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** class.uiproject.inc.php 24 Jun 2003 10:26:40 -0000 1.33
--- class.uiproject.inc.php 30 Jun 2003 10:49:14 -0000 1.34
***************
*** 546,550 ****
!
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences']['property']['workorder_approval_from'];
$need_approval =
$this->config->config_data['workorder_approval'];
--- 546,550 ----
!
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['workorder_approval_from'];
$need_approval =
$this->config->config_data['workorder_approval'];
Index: class.uirequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.uirequest.inc.php 28 Jun 2003 16:11:47 -0000 1.22
--- class.uirequest.inc.php 30 Jun 2003 10:49:14 -0000 1.23
***************
*** 629,633 ****
!
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences']['property']['workorder_approval_from'];
$notify =
$this->config->config_data['workorder_approval'];
--- 629,633 ----
!
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['workorder_approval_from'];
$notify =
$this->config->config_data['workorder_approval'];
Index: class.uitenant.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitenant.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.uitenant.inc.php 23 May 2003 08:40:19 -0000 1.2
--- class.uitenant.inc.php 30 Jun 2003 10:49:14 -0000 1.3
***************
*** 33,38 ****
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
- $this->grants =
$GLOBALS['phpgw']->acl->get_grants('property');
- $this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
$this->bo =
CreateObject($this->currentapp.'.botenant',True);
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
--- 33,36 ----
Index: class.uitts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** class.uitts.inc.php 28 Jun 2003 16:11:47 -0000 1.31
--- class.uitts.inc.php 30 Jun 2003 10:49:14 -0000 1.32
***************
*** 37,42 ****
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
- $this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
- $this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
$this->bo =
CreateObject($this->currentapp.'.botts',True);
$this->so2 =
CreateObject($this->currentapp.'.sotts2');
--- 37,40 ----
***************
*** 330,334 ****
if(!$values['assignedto'])
{
! $values['assignedto']=
$GLOBALS['phpgw_info']['user']['preferences']['property']['assigntodefault'];
}
--- 328,332 ----
if(!$values['assignedto'])
{
! $values['assignedto']=
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['assigntodefault'];
}
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** class.uiworkorder.inc.php 24 Jun 2003 10:26:40 -0000 1.26
--- class.uiworkorder.inc.php 30 Jun 2003 10:49:14 -0000 1.27
***************
*** 516,520 ****
!
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences']['property']['workorder_approval_from'];
$need_approval =
$this->config->config_data['workorder_approval'];
--- 516,520 ----
!
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['workorder_approval_from'];
$need_approval =
$this->config->config_data['workorder_approval'];
Index: class.uiXport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiXport.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** class.uiXport.inc.php 9 Jun 2003 20:48:40 -0000 1.29
--- class.uiXport.inc.php 30 Jun 2003 10:49:14 -0000 1.30
***************
*** 278,282 ****
'lang_cancel'
=> lang('Cancel'),
'lang_cancel_statustext' =>
lang('cancel the import'),
! 'action_url'
=> $GLOBALS['phpgw']->link('/index.php','menuaction=property.uiXport.import'),
'tsvfilename'
=> '',
--- 278,282 ----
'lang_cancel'
=> lang('Cancel'),
'lang_cancel_statustext' =>
lang('cancel the import'),
! 'action_url'
=> $GLOBALS['phpgw']->link('/index.php','menuaction='. $this->currentapp
.'.uiXport.import'),
'tsvfilename'
=> '',
Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_admin.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** hook_admin.inc.php 29 Jun 2003 10:12:52 -0000 1.37
--- hook_admin.inc.php 30 Jun 2003 10:49:14 -0000 1.38
***************
*** 25,32 ****
'Owner'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiowner.index'),
'Owner Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=owner'),
- 'Property Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=property'),
- 'Building Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=building'),
- 'Entrance Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=entrance'),
- 'Apartment Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=apartment'),
'Drawing Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=drawing'),
'Document Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=document'),
--- 25,28 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bocategory.inc.php,1.3,1.4 class.bocommon.inc.php,1.65,1.66 class.bodocument.inc.php,1.8,1.9 class.borequest.inc.php,1.7,1.8 class.socategory.inc.php,1.5,1.6 class.sodocument.inc.php,1.10,1.11 class.soequipment.inc.php,1.20,1.21 class.someter.inc.php,1.6,1.7 class.sotenant.inc.php,1.3,1.4class.uiadmin_location.inc.php,1.5,1.6 class.uicategory.inc.php,1.5,1.6 class.uidocument.inc.php,1.13,1.14 class.uidrawing.inc.php,1.21,1.22 class.uigab.inc.php,1.8,1.9 class.uiowner.inc.php,1.8,1.9 class.uiproject.inc.php,1.33,1.34 class.uirequest.inc.php,1.22,1.23 class.uitenant.inc.php,1.2,1.3 class.uitts.inc.php,1.31,1.32 class.uiworkorder.inc.php,1.26,1.27 class.uiXport.inc.php,1.29,1.30 hook_admin.inc.php,1.37,1.38,
Sigurd Nes <address@hidden> <=