[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.bocommon.inc.php class.bodoc...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.bocommon.inc.php class.bodoc... |
|
Date: |
Tue, 21 Aug 2007 12:26:05 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 07/08/21 12:26:05
Modified files:
inc : class.bocommon.inc.php class.bodocument.inc.php
class.boentity.inc.php
class.soadmin_entity.inc.php
class.sodocument.inc.php
class.uidocument.inc.php
Log message:
notices
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bocommon.inc.php?cvsroot=phpgroupware&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bodocument.inc.php?cvsroot=phpgroupware&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.boentity.inc.php?cvsroot=phpgroupware&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soadmin_entity.inc.php?cvsroot=phpgroupware&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.sodocument.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uidocument.inc.php?cvsroot=phpgroupware&r1=1.24&r2=1.25
Patches:
Index: class.bocommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- class.bocommon.inc.php 22 Mar 2007 10:35:27 -0000 1.66
+++ class.bocommon.inc.php 21 Aug 2007 12:26:04 -0000 1.67
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.bocommon.inc.php,v 1.66 2007/03/22 10:35:27
sigurdne Exp $
+ * @version $Id: class.bocommon.inc.php,v 1.67 2007/08/21 12:26:04
sigurdne Exp $
*/
/**
@@ -238,6 +238,8 @@
$output_list[$j]['id'] = $entry['id'];
$output_list[$j]['name'] =
$entry['name'];
+ if(isset($selected) &&
is_array($selected))
+ {
for ($i=0;$i<count($selected);$i++)
{
if($selected[$i] ==
$entry['id'])
@@ -245,6 +247,7 @@
$output_list[$j]['selected'] = 'selected';
}
}
+ }
$j++;
}
}
Index: class.bodocument.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bodocument.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- class.bodocument.inc.php 26 Jan 2007 14:53:46 -0000 1.10
+++ class.bodocument.inc.php 21 Aug 2007 12:26:04 -0000 1.11
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage document
- * @version $Id: class.bodocument.inc.php,v 1.10 2007/01/26 14:53:46
sigurdne Exp $
+ * @version $Id: class.bodocument.inc.php,v 1.11 2007/08/21 12:26:04
sigurdne Exp $
*/
/**
@@ -269,7 +269,7 @@
$soadmin_entity =
CreateObject($this->currentapp.'.soadmin_entity');
$categories =
$soadmin_entity->read_category(array('allrows'=>True,'entity_id'=>$this->entity_id));
- $category_list =
$this->bocommon->select_multi_list($selected,$categories);
+ $category_list =
$this->bocommon->select_list($selected,$categories);
return $category_list;
}
@@ -371,9 +371,9 @@
$receipt['message'][]=array('msg'=>lang('directory created') . ' :'.
$this->fakebase. SEP . 'document');
}
$this->vfs->override_acl = 0;
- }
return $receipt;
}
+ }
function create_document_dir($data,$receipt)
Index: class.boentity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.boentity.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- class.boentity.inc.php 26 Jan 2007 14:53:46 -0000 1.27
+++ class.boentity.inc.php 21 Aug 2007 12:26:04 -0000 1.28
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage entity
- * @version $Id: class.boentity.inc.php,v 1.27 2007/01/26 14:53:46
sigurdne Exp $
+ * @version $Id: class.boentity.inc.php,v 1.28 2007/08/21 12:26:04
sigurdne Exp $
*/
/**
@@ -102,7 +102,7 @@
$this->soadmin_entity =
CreateObject($this->currentapp.'.soadmin_entity',$entity_id,$cat_id);
$this->so =
CreateObject($this->currentapp.'.soentity',$entity_id,$cat_id);
- $this->category_name =
$this->soadmin_entity->category_name;
+ $this->category_name =
isset($this->soadmin_entity->category_name) ?
$this->soadmin_entity->category_name : '';
if ($start)
{
Index: class.soadmin_entity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soadmin_entity.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- class.soadmin_entity.inc.php 26 Jan 2007 14:53:46 -0000 1.30
+++ class.soadmin_entity.inc.php 21 Aug 2007 12:26:04 -0000 1.31
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: class.soadmin_entity.inc.php,v 1.30 2007/01/26 14:53:46
sigurdne Exp $
+ * @version $Id: class.soadmin_entity.inc.php,v 1.31 2007/08/21 12:26:04
sigurdne Exp $
*/
/**
@@ -122,14 +122,7 @@
{
if(is_array($data))
{
- if ($data['start'])
- {
- $start=$data['start'];
- }
- else
- {
- $start=0;
- }
+ $start = (isset($data['start'])&&
$data['start'] ? $data['start'] : 0);
$query =
(isset($data['query'])?$data['query']:'');
$sort =
(isset($data['sort'])?$data['sort']:'DESC');
$order =
(isset($data['order'])?$data['order']:'');
Index: class.sodocument.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.sodocument.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- class.sodocument.inc.php 26 Jan 2007 14:53:46 -0000 1.14
+++ class.sodocument.inc.php 21 Aug 2007 12:26:04 -0000 1.15
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage document
- * @version $Id: class.sodocument.inc.php,v 1.14 2007/01/26 14:53:46
sigurdne Exp $
+ * @version $Id: class.sodocument.inc.php,v 1.15 2007/08/21 12:26:04
sigurdne Exp $
*/
/**
@@ -119,8 +119,9 @@
$cols = $document_table . '.location_code';
$cols_return[] = 'location_code';
-// $cols .= ",$document_table.id as document_id";
-// $cols_return[] =
'document_id';
+ $uicols = array();
+ $joinmethod = '';
+ $paranthesis = '';
if ($entity_id)
{
Index: class.uidocument.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uidocument.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- class.uidocument.inc.php 14 Aug 2007 10:45:09 -0000 1.24
+++ class.uidocument.inc.php 21 Aug 2007 12:26:04 -0000 1.25
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage document
- * @version $Id: class.uidocument.inc.php,v 1.24 2007/08/14 10:45:09
sigurdne Exp $
+ * @version $Id: class.uidocument.inc.php,v 1.25 2007/08/21 12:26:04
sigurdne Exp $
*/
/**
@@ -208,9 +208,7 @@
'var' => 'location_code',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uidocument.index',
-
'type_id' =>
$type_id,
'query' =>
$this->query,
-
'district_id' =>
$this->district_id,
'cat_id' =>
$this->cat_id,
'doc_type' =>
$this->doc_type,
'entity_id' =>
$this->entity_id)
@@ -225,9 +223,7 @@
'var' => 'document_id',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uidocument.index',
-
'type_id' =>
$type_id,
'query' =>
$this->query,
-
'district_id' =>
$this->district_id,
'cat_id' =>
$this->cat_id,
'doc_type' =>
$this->doc_type,
'entity_id' =>
$this->entity_id)
@@ -242,9 +238,7 @@
'var' => 'address',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uidocument.index',
-
'type_id' =>
$type_id,
'query' =>
$this->query,
-
'district_id' =>
$this->district_id,
'cat_id' =>
$this->cat_id,
'doc_type' =>
$this->doc_type,
'entity_id' =>
$this->entity_id)
@@ -313,10 +307,6 @@
'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path'
=>
$GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
'type'
=> $this->cat_id,
-// 'district_list'
=>
$this->bocommon->select_district_list('filter',$this->district_id),
-// 'lang_no_district'
=> lang('no district'),
-// 'lang_district_statustext'
=> lang('Select the district the selection belongs to. To do not use a
district select NO DISTRICT'),
-// 'select_district_name'
=> 'district_id',
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_no_cat'
=> lang('no category'),
@@ -583,11 +573,6 @@
'select_name'
=> 'doc_type',
'cat_list'
=> $this->bocommon->select_category_list(array('format'=>'filter','selected' =>
$this->doc_type,'type' =>'document','order'=>'descr')),
-// 'district_list'
=> $this->bocommon->select_district_list('filter',$this->district_id),
-// 'lang_no_district'
=> lang('no district'),
-// 'lang_district_statustext'
=> lang('Select the district the selection belongs to. To do not use a district
select NO DISTRICT'),
-// 'select_district_name'
=> 'district_id',
-
'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_status_statustext'
=> lang('Select the status the document belongs to. To do not use a category
select NO STATUS'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.bocommon.inc.php class.bodoc...,
Sigurd Nes <=