|
| From: | nomail |
| Subject: | [Phpgroupware-cvs] property/inc/class.uidocument.inc.php, 1.3.2.2 |
| Date: | Mon, 8 Nov 2004 14:57:50 +0100 |
Update of /property/inc
Modified Files:
Branch: proposed-0_9_18-branch
class.uidocument.inc.php
date: 2004/11/08 13:57:50; author: sigurdne; state: Exp; lines: +43 -15
Log Message:
no message
=====================================================================
Index: property/inc/class.uidocument.inc.php
diff -u property/inc/class.uidocument.inc.php:1.3.2.1
property/inc/class.uidocument.inc.php:1.3.2.2
--- property/inc/class.uidocument.inc.php:1.3.2.1 Fri Oct 29 18:45:17 2004
+++ property/inc/class.uidocument.inc.php Mon Nov 8 13:57:50 2004
@@ -69,6 +69,7 @@
$this->status_id =
$this->bo->status_id;
$this->entity_id =
$this->bo->entity_id;
$this->doc_type =
$this->bo->doc_type;
+ $this->query_location =
$this->bo->query_location;
$this->menu->sub ='document';
}
@@ -85,7 +86,8 @@
'cat_id' => $this->cat_id,
'status_id' => $this->status_id,
'entity_id' => $this->entity_id,
- 'doc_type' => $this->doc_type
+ 'doc_type' => $this->doc_type,
+ 'query_location' => $this->query_location
);
$this->bo->save_sessiondata($data);
}
@@ -157,7 +159,7 @@
{
$content[$j]['row'][$k]['statustext'] = lang('view documents
for this location/entity');
$content[$j]['row'][$k]['text']
= lang('documents');
- $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.list_doc&location_code='
. $document_entry['location_code'] . '&p_num=' . $document_entry['p_num'] .
'&entity_id=' . $document_entry['p_entity_id'] . '&cat_id=' .
$document_entry['p_cat_id']);
+ $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.list_doc&location_code='
. $document_entry['location_code'] . '&p_num=' . $document_entry['p_num'] .
'&entity_id=' . $document_entry['p_entity_id'] . '&cat_id=' .
$document_entry['p_cat_id'] . '&doc_type=' . $this->doc_type);
$k++;
}
@@ -187,6 +189,7 @@
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
'cat_id'
=>$this->cat_id,
+
'doc_type'
=>$this->doc_type,
'entity_id'
=>$this->entity_id)
));
}
@@ -204,6 +207,7 @@
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
'cat_id'
=>$this->cat_id,
+
'doc_type'
=>$this->doc_type,
'entity_id'
=>$this->entity_id)
));
}
@@ -221,6 +225,7 @@
'lookup'
=>$lookup,
'district_id' =>
$this->district_id,
'cat_id'
=>$this->cat_id,
+
'doc_type'
=>$this->doc_type,
'entity_id'
=>$this->entity_id)
));
}
@@ -256,6 +261,7 @@
'filter'
=>$this->filter,
'status_id'
=>$this->status_id,
'query'
=>$this->query,
+ 'doc_type'
=>$this->doc_type,
'entity_id'
=>$this->entity_id
);
@@ -299,6 +305,11 @@
'select_name'
=> 'cat_id',
'cat_list'
=> $cat_list,
+ 'lang_no_doc_type'
=> lang('no document type'),
+ 'lang_doc_type_statustext' =>
lang('Select the document type the document belongs to.'),
+ 'doc_type'
=> $this->bo->select_doc_type_list('filter',$this->doc_type),
+
+
'lang_status_statustext' =>
lang('Select the status the document belongs to. To do not use a category
select NO STATUS'),
'status_name'
=> 'status_id',
'lang_no_status'
=> lang('No status'),
@@ -362,6 +373,11 @@
$GLOBALS['phpgw']->session->appsession('session_data','document_receipt','');
$location_code =
get_var('location_code',array('POST','GET'));
+ if($this->query_location)
+ {
+ $location_code = $this->query_location;
+ }
+
$p_num = get_var('p_num',array('POST','GET'));
$location=$this->bo->read_location_data($location_code);
@@ -381,17 +397,10 @@
$appname_sub = lang('location');
}
-
$entity_data[$this->entity_id]['p_cat_name']=$category['name'];
-
-
$location_data=$this->bolocation->initiate_ui_location(array(
- 'values' =>
$location,
- 'type_id' =>
count(explode('-',$location_code)),
- 'no_link' =>
False, // disable lookup links for location type less than type_id
- 'tenant' =>
False,
- 'lookup_type' => 'view',
- 'lookup_entity' =>
$lookup_entity,
- 'entity_data' => $entity_data
- ));
+ if($category['name'])
+ {
+
$entity_data[$this->entity_id]['p_cat_name']=$category['name'];
+ }
$this->config->read_repository();
$files_url = $this->config->config_data['files_url'];
@@ -466,7 +475,9 @@
'p_num'
=>$p_num,
'location_code'
=>$location_code,
'filter'
=>$this->filter,
-
'query'
=>$this->query)
+
'query'
=>$this->query,
+
'query_location'
=>$this->query_location
+
)
)),
'lang_document_name' => lang('Document
name'),
'lang_doc_type' => lang('Doc
type'),
@@ -509,9 +520,26 @@
'doc_type'
=>$this->doc_type,
'location_code'
=>$location_code,
'filter'
=>$this->filter,
- 'query'
=>$this->query
+ 'query'
=>$this->query,
+ 'query_location'
=>$this->query_location
);
+
+
$location_data=$this->bolocation->initiate_ui_location(array(
+ 'values' =>
$location,
+ 'type_id' =>
count(explode('-',$location_code)),
+ 'no_link' =>
False, // disable lookup links for location type less than type_id
+ 'tenant' =>
False,
+ 'lookup_type' => 'view',
+ 'lookup_entity' =>
$lookup_entity,
+ 'entity_data' => $entity_data,
+ 'link_data' =>
$link_data,
+ 'query_link' => True
+ ));
+
+//_debug_array($location_data);
+
+
$msgbox_data = $this->bocommon->msgbox_data($receipt);
$data = array
| [Prev in Thread] | Current Thread | [Next in Thread] |