[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.uiequipment.inc.php, 1.34, 1.35 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] property/inc class.uiequipment.inc.php, 1.34, 1.35 class.uireport.inc.php, 1.18, 1.19 class.bocommon.inc.php, 1.81, 1.82 class.sostandard_entity.inc.php, 1.17, 1.18 class.uistandard_entity.inc.php, 1.17, 1.18 class.bostandard_entity.inc.php, 1.11, 1.12 class.uidocument.inc.php, 1.16, 1.17 class.sodocument.inc.php, 1.12, 1.13 |
|
Date: |
Wed, 01 Oct 2003 19:26:48 +0000 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv26045/inc
Modified Files:
class.uiequipment.inc.php class.uireport.inc.php
class.bocommon.inc.php class.sostandard_entity.inc.php
class.uistandard_entity.inc.php
class.bostandard_entity.inc.php class.uidocument.inc.php
class.sodocument.inc.php
Log Message:
no message
Index: class.sodocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sodocument.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** class.sodocument.inc.php 9 Jul 2003 11:12:16 -0000 1.12
--- class.sodocument.inc.php 1 Oct 2003 19:26:45 -0000 1.13
***************
*** 285,288 ****
--- 285,289 ----
'document_id' =>
$this->db->f('id'),
'document_name' =>
$this->db->f('document_name'),
+ 'link' =>
$this->db->f('link'),
'title' =>
$this->db->f('title'),
'category' =>
$this->db->f('category'),
***************
*** 305,308 ****
--- 306,310 ----
$document['title']
= $this->db->f('title');
$document['document_name'] =
$this->db->f('document_name');
+ $document['link']
= $this->db->f('link');
$document['equipment_id'] =
$this->db->f('equipment_id');
$document['location_code'] =
$this->db->f('location_code');
***************
*** 367,388 ****
$document['title'] =
$this->db->db_addslashes($document['title']);
//_debug_array($document);
! $this->db->query("INSERT INTO fm_document
(document_name,title,access,category,entry_date,document_date,version,coordinator,status,"
.
"descr,location_code,address,branch_id,vendor_id,user_id $cols) "
! . "VALUES ('"
! . $document['document_name']. "','"
! . $document['title']. "','"
! . "public','"
! . $document['cat_id']. "','"
! . time() . "','"
! . $document['document_date']. "','"
! . $document['version']. "','"
! . $document['coordinator']. "','"
! . $document['status']. "','"
! . $document['descr']. "','"
! . $document['location_code']. "','"
! . $address . "','"
! . $document['branch_id']. "','"
! . $document['vendor_id']. "','"
! . $this->account. "' $vals
)",__LINE__,__FILE__);
$receipt['document_id'] =
$this->db->get_last_insert_id('fm_document','id');
--- 369,396 ----
$document['title'] =
$this->db->db_addslashes($document['title']);
//_debug_array($document);
!
! $values= array(
! $document['document_name'],
! $document['link'],
! $document['title'],
! 'public',
! $document['cat_id'],
! time(),
! $document['document_date'],
! $document['version'],
! $document['coordinator'],
! $document['status'],
! $document['descr'],
! $document['location_code'],
! $address,
! $document['branch_id'],
! $document['vendor_id'],
! $this->account);
!
! $values = $this->bocommon->validate_db_insert($values);
!
! $this->db->query("INSERT INTO fm_document
(document_name,link,title,access,category,entry_date,document_date,version,coordinator,status,"
.
"descr,location_code,address,branch_id,vendor_id,user_id $cols) "
! . "VALUES ($values $vals )",__LINE__,__FILE__);
$receipt['document_id'] =
$this->db->get_last_insert_id('fm_document','id');
***************
*** 464,481 ****
//_debug_array($document);
! $this->db->query("UPDATE fm_document set
! document_name ='" .
$document['document_name'] . "',
! title ='" .
$document['title'] . "',
! branch_id ='" .
$document['branch_id'] . "',
! status ='" .
$document['status'] . "',
! category ='" .
$document['cat_id'] . "',
! document_date ='" .
$document['document_date'] . "',
! coordinator ='" .
$document['coordinator'] . "',
! descr ='" .
$document['descr'] . "',
! version ='" .
$document['version'] . "',
! location_code ='" .
$document['location_code'] . "',
! vendor_id ='" .
$document['vendor_id'] . "',
! address ='" . $address
! . "' $vals WHERE id= '" .
$document['document_id'] ."'",__LINE__,__FILE__);
$receipt['document_id'] = $document['document_id'];
--- 472,495 ----
//_debug_array($document);
!
! $value_set=array(
! 'document_name' =>$document['document_name'],
! 'link' =>$document['link'],
! 'title' =>$document['title'],
! 'branch_id'
=>$document['branch_id'],
! 'status' =>$document['status'],
! 'category' =>$document['cat_id'],
! 'document_date' =>$document['document_date'],
! 'coordinator' =>$document['coordinator'],
! 'descr' =>$document['descr'],
! 'version' =>$document['version'],
! 'location_code' =>$document['location_code'],
! 'vendor_id'
=>$document['vendor_id'],
! 'address' =>$address
! );
!
! $value_set =
$this->bocommon->validate_db_update($value_set);
!
! $this->db->query("UPDATE fm_document set $value_set
$vals WHERE id= '" . $document['document_id'] ."'",__LINE__,__FILE__);
$receipt['document_id'] = $document['document_id'];
Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** class.bocommon.inc.php 29 Sep 2003 17:53:51 -0000 1.81
--- class.bocommon.inc.php 1 Oct 2003 19:26:45 -0000 1.82
***************
*** 171,175 ****
! function column_list($selected='',$entity_type='',$cat_id)
{
$bostandard_entity =
CreateObject($this->currentapp.'.bostandard_entity',True);
--- 171,175 ----
! function
column_list($selected='',$entity_type='',$cat_id,$allrows='')
{
$bostandard_entity =
CreateObject($this->currentapp.'.bostandard_entity',True);
***************
*** 180,184 ****
}
! $columns =
$bostandard_entity->read_attrib($entity_type,$cat_id);
$column_list=$this->select_multi_list($selected,$columns);
--- 180,185 ----
}
! $columns =
$bostandard_entity->read_attrib($entity_type,$cat_id,$allrows);
! //_debug_array($columns);
$column_list=$this->select_multi_list($selected,$columns);
Index: class.uistandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uistandard_entity.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** class.uistandard_entity.inc.php 26 Sep 2003 18:57:11 -0000 1.17
--- class.uistandard_entity.inc.php 1 Oct 2003 19:26:45 -0000 1.18
***************
*** 488,494 ****
'datatype_list' =>
$this->bo->select_datatype($attrib['datatype']),
'select_datatype' =>
'values[datatype]',
! 'value_list' =>
$values['list'],
! 'lang_list'
=> lang('show in list'),
! 'lang_list_statustext' => lang('check
to show this attribute in list')
);
//_debug_array($data);
--- 488,494 ----
'datatype_list' =>
$this->bo->select_datatype($attrib['datatype']),
'select_datatype' =>
'values[datatype]',
! // 'value_list' =>
$values['list'],
! // 'lang_list'
=> lang('show in list'),
! // 'lang_list_statustext' => lang('check
to show this attribute in list')
);
//_debug_array($data);
Index: class.uiequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiequipment.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** class.uiequipment.inc.php 30 Sep 2003 18:19:12 -0000 1.34
--- class.uiequipment.inc.php 1 Oct 2003 19:26:45 -0000 1.35
***************
*** 96,103 ****
for ($k=0;$k<$count_uicols_name;$k++)
{
!
if($uicols['input_type'][$k]!='hidden')
{
! $content[$j][$k]
= $equipment_entry[$uicols['name'][$k]];
!
$xls->WriteLabel(0,$k,$uicols['descr'][$k]);
$str.=$xls->WriteLabel(0,$m,$uicols['descr'][$k]);
$m++;
--- 96,103 ----
for ($k=0;$k<$count_uicols_name;$k++)
{
!
if($uicols['input_type'][$k]=='text')
{
! $content[$j][$m]
= $equipment_entry[$uicols['name'][$k]];
!
$xls->WriteLabel(0,$m,$uicols['descr'][$k]);
$str.=$xls->WriteLabel(0,$m,$uicols['descr'][$k]);
$m++;
***************
*** 165,169 ****
(
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
! 'column_list' =>
$this->bocommon->column_list($values['columns'],$entity_type='equipment',$cat_id=$this->cat_id),
'function_msg' => $function_msg,
'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
--- 165,169 ----
(
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
! 'column_list' =>
$this->bocommon->column_list($values['columns'],$entity_type='equipment',$cat_id=$this->cat_id,$allrows=True),
'function_msg' => $function_msg,
'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
***************
*** 172,176 ****
'select_name' => 'period'
);
-
$GLOBALS['phpgw_info']['flags']['app_header'] =
$function_msg;
--- 172,175 ----
Index: class.uireport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uireport.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** class.uireport.inc.php 29 Sep 2003 17:53:51 -0000 1.18
--- class.uireport.inc.php 1 Oct 2003 19:26:45 -0000 1.19
***************
*** 105,110 ****
if($uicols['input_type'][$k]!='hidden')
{
! $content[$j][$k]
= $report_entry[$uicols['name'][$k]];
!
$xls->WriteLabel(0,$k,$uicols['descr'][$k]);
$str.=$xls->WriteLabel(0,$m,$uicols['descr'][$k]);
$m++;
--- 105,110 ----
if($uicols['input_type'][$k]!='hidden')
{
! $content[$j][$m]
= $report_entry[$uicols['name'][$k]];
!
$xls->WriteLabel(0,$m,$uicols['descr'][$k]);
$str.=$xls->WriteLabel(0,$m,$uicols['descr'][$k]);
$m++;
***************
*** 172,176 ****
(
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
! 'column_list' =>
$this->bocommon->column_list($values['columns'],$entity_type='report',$cat_id=$this->cat_id),
'function_msg' => $function_msg,
'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
--- 172,176 ----
(
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
! 'column_list' =>
$this->bocommon->column_list($values['columns'],$entity_type='report',$cat_id=$this->cat_id,$allrows=True),
'function_msg' => $function_msg,
'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
Index: class.sostandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sostandard_entity.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** class.sostandard_entity.inc.php 26 Sep 2003 18:57:11 -0000 1.17
--- class.sostandard_entity.inc.php 1 Oct 2003 19:26:45 -0000 1.18
***************
*** 260,263 ****
--- 260,264 ----
$type = (isset($data['type'])?$data['type']:0);
$type_id =
(isset($data['type_id'])?$data['type_id']:0);
+ $allrows =
(isset($data['allrows'])?$data['allrows']:'');
}
***************
*** 288,292 ****
$this->db2->query($sql,__LINE__,__FILE__);
$this->total_records = $this->db2->num_rows();
! $this->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
while ($this->db->next_record())
--- 289,302 ----
$this->db2->query($sql,__LINE__,__FILE__);
$this->total_records = $this->db2->num_rows();
!
! if(!$allrows)
! {
! $this->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
! }
! else
! {
! $this->db->query($sql .
$ordermethod,__LINE__,__FILE__);
! }
!
while ($this->db->next_record())
***************
*** 322,326 ****
$attrib['type_name'] =
$this->db->f('type_name');
$attrib['datatype'] =
$this->db->f('datatype');
! $attrib['list'] = $this->db->f('list');
if($this->db->f('datatype')=='R' ||
$this->db->f('datatype')=='CH')
{
--- 332,336 ----
$attrib['type_name'] =
$this->db->f('type_name');
$attrib['datatype'] =
$this->db->f('datatype');
! // $attrib['list'] = $this->db->f('list');
if($this->db->f('datatype')=='R' ||
$this->db->f('datatype')=='CH')
{
***************
*** 383,393 ****
$attrib['name'],
$attrib['descr'],
! $attrib['datatype'],
! $attrib['list']
);
$values = $this->bocommon->validate_db_insert($values);
! $this->db->query("INSERT INTO $table (id,
type_id, name, descr, datatype,list) "
. "VALUES ($values)",__LINE__,__FILE__);
--- 393,403 ----
$attrib['name'],
$attrib['descr'],
! $attrib['datatype']
! // $attrib['list']
);
$values = $this->bocommon->validate_db_insert($values);
! $this->db->query("INSERT INTO $table (id,
type_id, name, descr, datatype) "
. "VALUES ($values)",__LINE__,__FILE__);
***************
*** 433,438 ****
'name' => $attrib['name'],
'type_id' => $attrib['type_id'],
! 'datatype' => $attrib['datatype'],
! 'list' => $attrib['list']
);
--- 443,448 ----
'name' => $attrib['name'],
'type_id' => $attrib['type_id'],
! 'datatype' => $attrib['datatype']
! // 'list' => $attrib['list']
);
Index: class.bostandard_entity.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bostandard_entity.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** class.bostandard_entity.inc.php 24 Sep 2003 15:40:50 -0000 1.11
--- class.bostandard_entity.inc.php 1 Oct 2003 19:26:45 -0000 1.12
***************
*** 157,164 ****
}
! function read_attrib($type='',$type_id='')
{
$attrib = $this->so->read_attrib(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'type' => $type,'type_id' => $type_id));
$this->total_records = $this->so->total_records;
--- 157,164 ----
}
! function read_attrib($type='',$type_id='',$allrows='')
{
$attrib = $this->so->read_attrib(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
!
'type' => $type,'type_id' => $type_id,'allrows' => $allrows));
$this->total_records = $this->so->total_records;
Index: class.uidocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidocument.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** class.uidocument.inc.php 18 Jul 2003 09:34:54 -0000 1.16
--- class.uidocument.inc.php 1 Oct 2003 19:26:45 -0000 1.17
***************
*** 358,362 ****
$this->config->read_repository();
! $link_to_files =
$this->config->config_data['files_url'];
$links = $this->bocommon->menu();
--- 358,362 ----
$this->config->read_repository();
! $files_url = $this->config->config_data['files_url'];
$links = $this->bocommon->menu();
***************
*** 377,383 ****
while (is_array($document_list) && list(,$document) =
each($document_list))
{
! if(!$link_to_files)
{
! $link_view_file =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.view_file&document_id='
. $document['document_id']);
}
--- 377,393 ----
while (is_array($document_list) && list(,$document) =
each($document_list))
{
! if($document['link'])
{
! $link_view_file=$document['link'];
! $document['document_name']='link';
! unset($link_to_files);
! }
! else
! {
! if(!$link_to_files)
! {
! $link_view_file =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.view_file&document_id='
. $document['document_id']);
! $link_to_files = $files_url;
! }
}
***************
*** 624,628 ****
$values['document_name']=$_FILES['document_file']['name'];
! if(!$values['document_name'] &&
!$values['document_name_orig'])
{
$receipt['error'][]=array('msg'=>lang('Please select a file to upload !'));
--- 634,638 ----
$values['document_name']=$_FILES['document_file']['name'];
! if((!$values['document_name'] &&
!$values['document_name_orig']) && !$values['link'])
{
$receipt['error'][]=array('msg'=>lang('Please select a file to upload !'));
***************
*** 671,675 ****
//echo $_FILES['document_file']['tmp_name'] .'<br>';
//echo $to_file .'<br>';
! if($values['document_name'])
{
if(!$this->bo->vfs->cp (array (
--- 681,685 ----
//echo $_FILES['document_file']['tmp_name'] .'<br>';
//echo $to_file .'<br>';
! if($values['document_name'] &&
!$values['link'])
{
if(!$this->bo->vfs->cp (array (
***************
*** 812,815 ****
--- 822,829 ----
'value_version'
=> $values['version'],
'lang_version_statustext' =>
lang('Enter document version'),
+
+ 'lang_link'
=> lang('Link'),
+ 'value_link'
=> $values['link'],
+ 'lang_link_statustext' =>
lang('Alternative - link instead of uploading a file'),
'lang_descr_statustext' =>
lang('Enter a description of the document'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.uiequipment.inc.php, 1.34, 1.35 class.uireport.inc.php, 1.18, 1.19 class.bocommon.inc.php, 1.81, 1.82 class.sostandard_entity.inc.php, 1.17, 1.18 class.uistandard_entity.inc.php, 1.17, 1.18 class.bostandard_entity.inc.php, 1.11, 1.12 class.uidocument.inc.php, 1.16, 1.17 class.sodocument.inc.php, 1.12, 1.13,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] property/templates/default equipment.xsl, 1.16, 1.17 standard_entity.xsl, 1.12, 1.13 attributes_form.xsl, 1.6, 1.7 attributes_view.xsl, 1.5, 1.6 document.xsl, 1.5, 1.6
- Next by Date:
[Phpgroupware-cvs] projects/inc class.uibilling.inc.php, 1.18.2.6.2.7, 1.18.2.6.2.8 class.uideliveries.inc.php, 1.21.2.3.2.7, 1.21.2.3.2.8
- Previous by thread:
[Phpgroupware-cvs] property/templates/default equipment.xsl, 1.16, 1.17 standard_entity.xsl, 1.12, 1.13 attributes_form.xsl, 1.6, 1.7 attributes_view.xsl, 1.5, 1.6 document.xsl, 1.5, 1.6
- Next by thread:
[Phpgroupware-cvs] projects/inc class.uibilling.inc.php, 1.18.2.6.2.7, 1.18.2.6.2.8 class.uideliveries.inc.php, 1.21.2.3.2.7, 1.21.2.3.2.8
- Index(es):