|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [6933] property: generalize |
| Date: | Sat, 05 Feb 2011 15:31:02 +0000 |
Revision: 6933
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6933
Author: sigurdne
Date: 2011-02-05 15:31:02 +0000 (Sat, 05 Feb 2011)
Log Message:
-----------
property: generalize
Modified Paths:
--------------
trunk/property/inc/class.bogeneric.inc.php
trunk/property/inc/class.bos_agreement.inc.php
trunk/property/inc/class.soentity.inc.php
trunk/property/inc/class.sogeneric.inc.php
trunk/property/inc/class.sos_agreement.inc.php
trunk/property/inc/class.uientity.inc.php
trunk/property/inc/class.uigeneric.inc.php
trunk/property/inc/class.uis_agreement.inc.php
trunk/property/templates/base/files.xsl
Modified: trunk/property/inc/class.bogeneric.inc.php
===================================================================
--- trunk/property/inc/class.bogeneric.inc.php 2011-02-04 15:03:18 UTC (rev
6932)
+++ trunk/property/inc/class.bogeneric.inc.php 2011-02-05 15:31:02 UTC (rev
6933)
@@ -112,11 +112,11 @@
{
if(!$selected)
{
- $selected =
$GLOBALS['phpgw_info']['user']['preferences']['property']["generic_columns_{$this->type}_{$this->type_id}"];
+ $selected =
$GLOBALS['phpgw_info']['user']['preferences'][$this->location_info['acl_app']]["generic_columns_{$this->type}_{$this->type_id}"];
}
$filter = array('list' => ''); // translates to "list
IS NULL"
- $columns =
$this->custom->find('property',$this->location_info['acl_location'], 0,
'','','',true, false, $filter);
+ $columns =
$this->custom->find($this->location_info['acl_app'],$this->location_info['acl_location'],
0, '','','',true, false, $filter);
$column_list=$this->bocommon->select_multi_list($selected,$columns);
return $column_list;
@@ -147,11 +147,11 @@
public function read_single($data=array())
{
$custom_fields = false;
-
if($GLOBALS['phpgw']->locations->get_attrib_table('property',
$this->location_info['acl_location']))
+
if($GLOBALS['phpgw']->locations->get_attrib_table($this->location_info['acl_app'],
$this->location_info['acl_location']))
{
$custom_fields = true;
$values = array();
- $values['attributes'] =
$this->custom->find('property', $this->location_info['acl_location'], 0, '',
'ASC', 'attrib_sort', true, true);
+ $values['attributes'] =
$this->custom->find($this->location_info['acl_app'],
$this->location_info['acl_location'], 0, '', 'ASC', 'attrib_sort', true, true);
}
if(isset($data['id']) && $data['id'])
@@ -160,7 +160,7 @@
}
if($custom_fields)
{
- $values = $this->custom->prepare($values,
'property',$this->location_info['acl_location'], $data['view']);
+ $values = $this->custom->prepare($values,
$this->location_info['acl_app'],$this->location_info['acl_location'],
$data['view']);
}
return $values;
}
Modified: trunk/property/inc/class.bos_agreement.inc.php
===================================================================
--- trunk/property/inc/class.bos_agreement.inc.php 2011-02-04 15:03:18 UTC
(rev 6932)
+++ trunk/property/inc/class.bos_agreement.inc.php 2011-02-05 15:31:02 UTC
(rev 6933)
@@ -83,6 +83,7 @@
$role =
phpgw::get_var('role');
$member_id =
phpgw::get_var('member_id', 'int');
+ $this->p_num = phpgw::get_var('p_num');
$this->role = $role;
$this->so->role = $role;
@@ -150,7 +151,7 @@
{
$s_agreement = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
'filter' => $this->filter,'cat_id' =>
$this->cat_id,'allrows'=>$this->allrows,'member_id'=>$this->member_id,
- 'vendor_id'=>$this->vendor_id));
+ 'vendor_id'=>$this->vendor_id, 'p_num' =>
$this->p_num));
$this->total_records = $this->so->total_records;
$this->uicols = $this->so->uicols;
Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php 2011-02-04 15:03:18 UTC (rev
6932)
+++ trunk/property/inc/class.soentity.inc.php 2011-02-05 15:31:02 UTC (rev
6933)
@@ -1052,6 +1052,22 @@
);
}
+ $sql = "SELECT count(*) as hits FROM fm_s_agreement
{$this->join} fm_s_agreement_detail ON fm_s_agreement.id =
fm_s_agreement_detail.agreement_id WHERE p_entity_id = {$entity_id} AND
p_cat_id = {$cat_id} AND p_num = '{$id}'";
+ $this->db->query($sql,__LINE__,__FILE__);
+ $this->db->next_record();
+ if($this->db->f('hits'))
+ {
+ $hits = $this->db->f('hits');
+ $entity['related'][] = array
+ (
+ 'entity_link' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
'property.uis_agreement.index',
+
'query' =>
"entity.{$entity_id}.{$cat_id}.{$id}",
+
'p_num' => $id)),
+ 'name' =>
lang('service agreement') . " [{$hits}]",
+ 'descr' =>
lang('service agreement')
+ );
+ }
+
return $entity;
}
}
Modified: trunk/property/inc/class.sogeneric.inc.php
===================================================================
--- trunk/property/inc/class.sogeneric.inc.php 2011-02-04 15:03:18 UTC (rev
6932)
+++ trunk/property/inc/class.sogeneric.inc.php 2011-02-05 15:31:02 UTC (rev
6933)
@@ -127,15 +127,15 @@
}
$custom_fields = false;
-
if($GLOBALS['phpgw']->locations->get_attrib_table('property',
$this->location_info['acl_location']))
+
if($GLOBALS['phpgw']->locations->get_attrib_table($this->location_info['acl_app'],
$this->location_info['acl_location']))
{
$custom_fields = true;
$choice_table = 'phpgw_cust_choice';
$attribute_table = 'phpgw_cust_attribute';
- $location_id =
$GLOBALS['phpgw']->locations->get_id('property',
$this->location_info['acl_location']);
+ $location_id =
$GLOBALS['phpgw']->locations->get_id($this->location_info['acl_app'],
$this->location_info['acl_location']);
$attribute_filter = " location_id =
{$location_id}";
- $user_columns =
isset($GLOBALS['phpgw_info']['user']['preferences']['property']["generic_columns_{$this->type}_{$this->type_id}"])?$GLOBALS['phpgw_info']['user']['preferences']['property']["generic_columns_{$this->type}_{$this->type_id}"]:'';
+ $user_columns =
isset($GLOBALS['phpgw_info']['user']['preferences'][$this->location_info['acl_app']]["generic_columns_{$this->type}_{$this->type_id}"])?$GLOBALS['phpgw_info']['user']['preferences'][$this->location_info['acl_app']]["generic_columns_{$this->type}_{$this->type_id}"]:'';
$user_column_filter = '';
if (isset($user_columns) AND
is_array($user_columns) AND $user_columns[0])
@@ -248,7 +248,7 @@
}
}
- if (isset($_querymethod) AND
is_array($_querymethod))
+ if (isset($_querymethod) &&
is_array($_querymethod) && $_querymethod)
{
$querymethod .= " $where (" .
implode (' OR ',$_querymethod) . ')';
}
@@ -370,6 +370,7 @@
'edit_msg'
=> lang('edit'),
'add_msg'
=> lang('add'),
'name'
=> lang('part of town'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::property::location::town',
/*
@@ -402,6 +403,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' => '',
+ 'acl_app'
=> 'property',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::project_group'
);
@@ -423,6 +425,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' => lang('dimb'),
+ 'acl_app'
=> 'property',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::accounting::accounting_dimb'
);
@@ -444,6 +447,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' => lang('dimd'),
+ 'acl_app'
=> 'property',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::accounting::accounting_dimd'
);
@@ -465,6 +469,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' => '',
+ 'acl_app'
=> 'property',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::accounting::accounting_tax'
);
@@ -486,6 +491,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' => '',
+ 'acl_app'
=> 'property',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::accounting::voucher_cats'
);
@@ -507,6 +513,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' => '',
+ 'acl_app'
=> 'property',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::accounting::voucher_type'
);
@@ -528,6 +535,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' => '',
+ 'acl_app'
=> 'property',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::tender'
);
@@ -554,6 +562,7 @@
'edit_msg' =>
lang('edit'),
'add_msg' =>
lang('add'),
'name' => '',
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
"admin::property::location::location::category_{$type_id}"
);
@@ -580,6 +589,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' => '',
+ 'acl_app'
=> 'property',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::owner::owner_cats'
);
@@ -601,6 +611,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' => lang('tenant
category'),
+ 'acl_app'
=> 'property',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::tenant::tenant_cats'
);
@@ -622,6 +633,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' => lang('vendor
category'),
+ 'acl_app'
=> 'property',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::vendor::vendor_cats'
);
@@ -675,6 +687,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' =>
lang('vendor'),
+ 'acl_app'
=> 'property',
'acl_location' => '.vendor',
'menu_selection' =>
'property::invoice::vendor',
'default'
=> array
@@ -718,6 +731,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' =>
lang('owner'),
+ 'acl_app'
=> 'property',
'acl_location' => '.owner',
'menu_selection' =>
'admin::property::owner',
'default'
=> array
@@ -762,6 +776,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' =>
lang('tenant'),
+ 'acl_app'
=> 'property',
'acl_location' => '.tenant',
'menu_selection' =>
'admin::property::tenant',
'default'
=> array
@@ -790,6 +805,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' =>
lang('district'),
+ 'acl_app'
=> 'property',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::location::district'
);
@@ -811,6 +827,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' =>
lang('streetaddress'),
+ 'acl_app'
=> 'property',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::location::street'
);
@@ -832,6 +849,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' => '',
+ 'acl_app'
=> 'property',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::agreement::service_agree_cats'
);
@@ -853,6 +871,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' => '',
+ 'acl_app'
=> 'property',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::tenant::claims_cats'
);
@@ -874,6 +893,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' => '',
+ 'acl_app'
=> 'property',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::workorder_detail'
);
@@ -895,6 +915,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' => 'condition
type',
+ 'acl_app'
=> 'property',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::request_condition'
);
@@ -916,6 +937,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' =>
lang('authorities demands'),
+ 'acl_app'
=> 'property',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::authorities_demands',
'default'
=> array
@@ -958,6 +980,7 @@
'edit_msg' => lang('edit'),
'add_msg' => lang('add'),
'name' => lang('budget
account group'),
+ 'acl_app'
=> 'property',
'acl_location' => '.admin',
'menu_selection' =>
'admin::property::accounting::accounting_cats'
);
@@ -992,6 +1015,7 @@
'edit_msg'
=> lang('edit status'),
'add_msg'
=> lang('add status'),
'name'
=> lang('project status'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::property::project_status'
);
@@ -1037,6 +1061,7 @@
'edit_msg'
=> lang('edit status'),
'add_msg'
=> lang('add status'),
'name'
=> lang('workorder status'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::property::workorder_status'
);
@@ -1058,6 +1083,7 @@
'edit_msg'
=> lang('edit status'),
'add_msg'
=> lang('add status'),
'name'
=> lang('request status'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::property::request_status'
);
@@ -1079,6 +1105,7 @@
'edit_msg'
=> lang('edit status'),
'add_msg'
=> lang('add status'),
'name'
=> lang('agreement status'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::property::agreement::agreement_status'
);
@@ -1100,6 +1127,7 @@
'edit_msg'
=> lang('edit'),
'add_msg'
=> lang('add'),
'name'
=> lang('building part'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::property::building_part'
);
@@ -1121,6 +1149,7 @@
'edit_msg'
=> lang('edit status'),
'add_msg'
=> lang('add status'),
'name'
=> lang('document status'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::property::document_status'
);
@@ -1142,6 +1171,7 @@
'edit_msg'
=> lang('edit unit'),
'add_msg'
=> lang('add unit'),
'name'
=> lang('unit'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::property::unit'
);
@@ -1211,6 +1241,7 @@
'edit_msg'
=> lang('edit'),
'add_msg'
=> lang('add'),
'name'
=> lang('budget account'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.b_account',
'menu_selection' =>
'property::invoice::budget_account',
'default'
=> array
@@ -1240,6 +1271,7 @@
'edit_msg'
=> lang('edit process code'),
'add_msg'
=> lang('add process code'),
'name'
=> lang('process code'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::property::accounting::process_code',
'default'
=> array
@@ -1276,6 +1308,7 @@
'edit_msg'
=> lang('edit'),
'add_msg'
=> lang('add'),
'name'
=> lang('order_dim1'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::property::order_dim1'
);
@@ -1303,6 +1336,7 @@
'edit_msg'
=> lang('edit'),
'add_msg'
=> lang('add'),
'name'
=> lang('branch'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::property::branch'
);
@@ -1331,6 +1365,7 @@
'edit_msg'
=> lang('edit'),
'add_msg'
=> lang('add'),
'name'
=> lang('branch'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::property::key_location'
);
@@ -1366,6 +1401,7 @@
'edit_msg'
=> lang('edit'),
'add_msg'
=> lang('add'),
'name'
=> lang('Async services'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::property::async'
);
@@ -1407,6 +1443,7 @@
'edit_msg'
=> lang('edit'),
'add_msg'
=> lang('add'),
'name'
=> lang('event action'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::property::event_action',
'default'
=> array
@@ -1480,11 +1517,12 @@
'edit_msg'
=> lang('edit'),
'add_msg'
=> lang('add'),
'name'
=> lang('event action'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::property::ticket_status'
);
break;
-
+//START HELPDESK - APP
case 'helpdesk_status':
// the helpdesk app
$info = array
@@ -1540,10 +1578,13 @@
'edit_msg'
=> lang('edit'),
'add_msg'
=> lang('add'),
'name'
=> lang('event action'),
+ 'acl_app'
=> 'helpdesk',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::helpdesk::ticket_status'
);
break;
+
+//END HELPDESK - APP
case 'pending_action_type':
$info = array
(
@@ -1567,6 +1608,7 @@
'edit_msg'
=> lang('edit'),
'add_msg'
=> lang('add'),
'name'
=> lang('Pending action type'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::property::action_type'
);
@@ -1603,6 +1645,7 @@
'edit_msg'
=> lang('edit'),
'add_msg'
=> lang('add'),
'name'
=> lang('order template'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.ticket.order',
'menu_selection' =>
'property::helpdesk::order_template',
'default'
=> array
@@ -1645,6 +1688,7 @@
'edit_msg'
=> lang('edit'),
'add_msg'
=> lang('add'),
'name'
=> lang('response template'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.ticket',
'menu_selection' =>
'property::helpdesk::response_template',
'default'
=> array
@@ -1706,6 +1750,7 @@
'edit_msg'
=> lang('edit'),
'add_msg'
=> lang('add'),
'name'
=> lang('responsibility role'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::property::responsibility_role',
'default'
=> array
@@ -1720,7 +1765,6 @@
break;
case 'custom_menu_items':
-
$info = array
(
'table'
=> 'fm_custom_menu_items',
@@ -1763,6 +1807,7 @@
'edit_msg'
=> lang('edit'),
'add_msg'
=> lang('add'),
'name'
=> lang('custom menu items'),
+ 'acl_app'
=> 'property',
'acl_location' =>
'.admin',
'menu_selection' =>
'admin::property::custom_menu_items',
'default'
=> array
@@ -1775,7 +1820,76 @@
);
break;
+// START BOOKING TABLES
+ case 'bb_office':
+ $info = array
+ (
+ 'table'
=> 'bb_office',
+ 'id'
=> array('name' => 'id', 'type' => 'auto'),
+ 'fields'
=> array
+ (
+ array
+ (
+ 'name' =>
'name',
+ 'descr' =>
lang('name'),
+ 'type' =>
'varchar'
+ )
+ ),
+ 'edit_msg'
=> lang('edit'),
+ 'add_msg'
=> lang('add'),
+ 'name'
=> $GLOBALS['phpgw']->translation->translate('office', array(), false,
'booking'),
+ 'acl_app'
=> 'booking',
+ 'acl_location' =>
'.office',
+ 'menu_selection' =>
'booking::settings::office',
+ 'default'
=> array
+ (
+ 'user_id'
=> array('add' => '$this->account'),
+ 'entry_date' =>
array('add' => 'time()'),
+ 'modified_date' =>
array('edit' => 'time()'),
+ ),
+ 'check_grant' => false
+ );
+ break;
+ case 'bb_office_user':
+ $info = array
+ (
+ 'table'
=> 'bb_office_user',
+ 'id'
=> array('name' => 'id', 'type' => 'auto'),
+ 'fields'
=> array
+ (
+ array
+ (
+ 'name'
=> 'office',
+ 'descr'
=> $GLOBALS['phpgw']->translation->translate('office', array(), false,
'booking'),
+ 'type'
=> 'select',
+ 'filter'
=> true,
+ 'values_def'
=> array
+ (
+
'valueset' => false,
+
'method' => 'property.bogeneric.get_list',
+
'method_input' => array('type' => 'bb_office', 'selected' => '##office##')
+ )
+ )
+ ),
+ 'edit_msg'
=> lang('edit'),
+ 'add_msg'
=> lang('add'),
+ 'name'
=> $GLOBALS['phpgw']->translation->translate('office user', array(), false,
'booking'),
+ 'acl_app'
=> 'booking',
+ 'acl_location' =>
'.office.user',
+ 'menu_selection' =>
'booking::settings::office::office_user',
+ 'default'
=> array
+ (
+ 'user_id'
=> array('add' => '$this->account'),
+ 'entry_date' =>
array('add' => 'time()'),
+ 'modified_date' =>
array('edit' => 'time()'),
+ ),
+ 'check_grant' => false
+ );
+
+ break;
+
+// END BOOKING TABLES
default:
$receipt = array();
$receipt['error'][]=array('msg'=>lang('ERROR:
illegal type %1', $type));
Modified: trunk/property/inc/class.sos_agreement.inc.php
===================================================================
--- trunk/property/inc/class.sos_agreement.inc.php 2011-02-04 15:03:18 UTC
(rev 6932)
+++ trunk/property/inc/class.sos_agreement.inc.php 2011-02-05 15:31:02 UTC
(rev 6933)
@@ -81,6 +81,7 @@
$member_id =
isset($data['member_id']) && $data['member_id'] ? $data['member_id'] : 0;
$s_agreement_id =
isset($data['s_agreement_id'])?$data['s_agreement_id']:'';
$detail =
isset($data['detail'])?$data['detail']:'';
+ $p_num = isset($data['p_num'])
? $data['p_num'] : '';
}
$choice_table = 'phpgw_cust_choice';
@@ -94,9 +95,11 @@
$attribute_filter = " location_id =
{$location_id}";
$paranthesis ='(';
- $joinmethod = " $this->join $category_table ON
( $entity_table.category =$category_table.id))";
+ $joinmethod = " {$this->join} {$category_table}
ON ( $entity_table.category =$category_table.id))";
$paranthesis .='(';
- $joinmethod .= " $this->left_join fm_vendor ON
( $entity_table.vendor_id =fm_vendor.id))";
+ $joinmethod .= " {$this->left_join} fm_vendor
ON ( $entity_table.vendor_id =fm_vendor.id))";
+ $paranthesis .='(';
+ $joinmethod .= " {$this->left_join}
fm_s_agreement_detail ON ( fm_s_agreement.id =
fm_s_agreement_detail.agreement_id))";
$cols = $entity_table .
".*,$category_table.descr as category, org_name";
@@ -234,7 +237,7 @@
$uicols['import'][] = false;
}
- $sql = "SELECT $cols FROM $paranthesis $entity_table
$joinmethod";
+ $sql = "SELECT DISTINCT $cols FROM $paranthesis
$entity_table $joinmethod";
$i = count($uicols['name']);
@@ -349,30 +352,39 @@
{
$query = $this->db->db_addslashes($query);
- $query_arr = array();
- $this->db->query("SELECT * FROM
$attribute_table WHERE search='1' AND $attribute_filter");
+ if($p_num)
+ {
+ $query=explode(".",$query);
+ $querymethod = " {$where}
(fm_s_agreement_detail.p_entity_id='" . (int)$query[1] . "' AND
fm_s_agreement_detail.p_cat_id='" . (int)$query[2] . "' AND
fm_s_agreement_detail.p_num='{$query[3]}')";
+ $where = 'AND';
+ }
+ else
+ {
+ $query_arr = array();
+ $this->db->query("SELECT * FROM
$attribute_table WHERE search='1' AND $attribute_filter");
- while ($this->db->next_record())
- {
- if($this->db->f('datatype')=='V' ||
$this->db->f('datatype')=='email' || $this->db->f('datatype')=='CH')
+ while ($this->db->next_record())
{
- $query_arr[]= "$entity_table."
. $this->db->f('column_name') . " $this->like '%$query%'";
+
if($this->db->f('datatype')=='V' || $this->db->f('datatype')=='email' ||
$this->db->f('datatype')=='CH')
+ {
+ $query_arr[]=
"$entity_table." . $this->db->f('column_name') . " $this->like '%$query%'";
+ }
+ else
+ {
+ $query_arr[]=
"$entity_table." . $this->db->f('column_name') . " = '$query'";
+ }
}
- else
+
+ if (isset($query_arr[0]))
{
- $query_arr[]= "$entity_table."
. $this->db->f('column_name') . " = '$query'";
+ $querymethod = " $where (" .
implode (' OR ',$query_arr) . ')';
+ $where = 'AND';
}
}
-
- if (isset($query_arr[0]))
- {
- $querymethod = " $where (" . implode ('
OR ',$query_arr) . ')';
- $where = 'AND';
- }
}
$sql .= " $filtermethod $querymethod";
- //echo $sql;
+// echo $sql;
$this->db2->query($sql,__LINE__,__FILE__);
$this->total_records = $this->db2->num_rows();
@@ -464,7 +476,7 @@
}
$j++;
}
- //html_print_r($s_agreement_list);
+//_debug_array($s_agreement_list);
return $s_agreement_list;
}
Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php 2011-02-04 15:03:18 UTC (rev
6932)
+++ trunk/property/inc/class.uientity.inc.php 2011-02-05 15:31:02 UTC (rev
6933)
@@ -1786,18 +1786,11 @@
'lang_start_ticket'
=> lang('start ticket'),
'ticket_link'
=> $GLOBALS['phpgw']->link('/index.php',$ticket_link_data),
'fileupload'
=> $category['fileupload'],
- // 'jasperupload'
=> $category['jasperupload'],
+ // 'jasperupload'
=> $category['jasperupload'],
'link_view_file'
=> $GLOBALS['phpgw']->link('/index.php',$link_file_data),
- // 'link_to_files'
=> $link_to_files,
+ // 'link_to_files'
=> $link_to_files,
'files'
=> isset($values['files'])?$values['files']:'',
- // 'jasperfiles'
=>
isset($values['jasperfiles'])?$values['jasperfiles']:'',
- 'lang_files'
=> lang('files'),
- 'lang_filename'
=> lang('Filename'),
- 'lang_file_action'
=> lang('Delete file'),
- 'lang_view_file_statustext'
=> lang('click to view file'),
- 'lang_file_action_statustext' =>
lang('Check to delete file'),
- 'lang_upload_file'
=> lang('Upload file'),
- 'lang_file_statustext'
=> lang('Select file to upload'),
+ // 'jasperfiles'
=> isset($values['jasperfiles'])?$values['jasperfiles']:'',
'multiple_uploader'
=> $id ? true : '',
'fileuploader_action'
=> "{menuaction:'property.fileuploader.add',"
."upload_target:'property.uientity.addfiles',"
Modified: trunk/property/inc/class.uigeneric.inc.php
===================================================================
--- trunk/property/inc/class.uigeneric.inc.php 2011-02-04 15:03:18 UTC (rev
6932)
+++ trunk/property/inc/class.uigeneric.inc.php 2011-02-05 15:31:02 UTC (rev
6933)
@@ -65,11 +65,11 @@
$GLOBALS['phpgw_info']['flags']['menu_selection'] =
$this->location_info['menu_selection'];
$this->acl = &
$GLOBALS['phpgw']->acl;
$this->acl_location =
$this->location_info['acl_location'];
- $this->acl_read =
$this->acl->check($this->acl_location, PHPGW_ACL_READ, 'property');
- $this->acl_add =
$this->acl->check($this->acl_location, PHPGW_ACL_ADD, 'property');
- $this->acl_edit =
$this->acl->check($this->acl_location, PHPGW_ACL_EDIT, 'property');
- $this->acl_delete =
$this->acl->check($this->acl_location, PHPGW_ACL_DELETE, 'property');
- $this->acl_manage =
$this->acl->check($this->acl_location, 16, 'property');
+ $this->acl_read =
$this->acl->check($this->acl_location, PHPGW_ACL_READ,
$this->location_info['acl_app']);
+ $this->acl_add =
$this->acl->check($this->acl_location, PHPGW_ACL_ADD,
$this->location_info['acl_app']);
+ $this->acl_edit =
$this->acl->check($this->acl_location, PHPGW_ACL_EDIT,
$this->location_info['acl_app']);
+ $this->acl_delete =
$this->acl->check($this->acl_location, PHPGW_ACL_DELETE,
$this->location_info['acl_app']);
+ $this->acl_manage =
$this->acl->check($this->acl_location, 16, $this->location_info['acl_app']);
$this->start =
$this->bo->start;
$this->query =
$this->bo->query;
@@ -117,7 +117,7 @@
{
$GLOBALS['phpgw']->preferences->account_id =
$this->account;
$GLOBALS['phpgw']->preferences->read();
-
$GLOBALS['phpgw']->preferences->add('property',"generic_columns_{$this->type}_{$this->type_id}",$values['columns'],'user');
+
$GLOBALS['phpgw']->preferences->add($this->location_info['acl_app'],"generic_columns_{$this->type}_{$this->type_id}",$values['columns'],'user');
$GLOBALS['phpgw']->preferences->save_repository();
$receipt['message'][] = array('msg' =>
lang('columns is updated'));
@@ -155,7 +155,8 @@
{
if(!$this->acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uilocation.stop', 'perm'=>1, 'acl_location'=> $this->acl_location));
+ $this->bocommon->no_access();
+ return;
}
$receipt =
$GLOBALS['phpgw']->session->appsession('session_data',
"general_receipt_{$this->type}_{$this->type_id}");
@@ -249,7 +250,7 @@
);
-
if($GLOBALS['phpgw']->locations->get_attrib_table('property',
$this->location_info['acl_location']))
+
if($GLOBALS['phpgw']->locations->get_attrib_table($this->location_info['acl_app'],
$this->location_info['acl_location']))
{
$datatable['actions']['form'][0]['fields']['field'][] = array
(
@@ -557,7 +558,7 @@
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/paginator/assets/skins/sam/paginator.css');
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/container/assets/skins/sam/container.css');
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . "::{$appname}::{$function_msg}";
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
$GLOBALS['phpgw']->translation->translate($this->location_info['acl_app'],
array(), false, $this->location_info['acl_app']) .
"::{$appname}::{$function_msg}";
$GLOBALS['phpgw']->js->validate_file( 'yahoo',
'generic.index', 'property' );
}
@@ -566,14 +567,22 @@
{
if(!$this->acl_add)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uilocation.stop', 'perm'=> 2, 'acl_location'=> $this->acl_location));
+ $this->bocommon->no_access();
+ return;
}
$id =
phpgw::get_var($this->location_info['id']['name']);
$values = phpgw::get_var('values');
$values_attribute = phpgw::get_var('values_attribute');
-
+ if(is_array($values_attribute))
+ {
+ foreach($values_attribute as &$_attr)
+ {
+ $_attr['value'] =
phpgw::get_var($_attr['name']);
+ }
+ }
+
$GLOBALS['phpgw_info']['apps']['manual']['section'] =
'general.edit.' . $this->type;
$GLOBALS['phpgw']->xslttpl->add_file(array('generic','attributes_form'));
@@ -581,16 +590,16 @@
if (is_array($values))
{
- $insert_record_values =
$GLOBALS['phpgw']->session->appsession("insert_record_values{$this->acl_location}",'property');
+ $insert_record_values =
$GLOBALS['phpgw']->session->appsession("insert_record_values{$this->acl_location}",$this->location_info['acl_app']);
if(is_array($insert_record_values))
{
foreach($insert_record_values as $field)
{
- $values['extra'][$field] =
phpgw::get_var($field);
+// $values['extra'][$field] =
phpgw::get_var($field);
}
}
-
+// $values =
$this->bocommon->collect_locationdata($values,$insert_record_values);
if ((isset($values['save']) && $values['save'])
|| (isset($values['apply']) && $values['apply']))
{
if($GLOBALS['phpgw']->session->is_repost())
@@ -624,7 +633,7 @@
{
foreach ($values_attribute as
$attribute )
{
-
if($attribute['nullable'] != 1 && !$attribute['value'])
+
if($attribute['nullable'] != 1 && (!$attribute['value'] &&
!$values['extra'][$attribute['name']]))
{
$receipt['error'][]=array('msg'=>lang('Please enter value for attribute %1',
$attribute['input_text']));
}
@@ -640,7 +649,8 @@
{
$id = $values['id'];
}
-
+//_debug_array($values);
+//_debug_array($values_attribute);die();
if(!$receipt['error'])
{
$receipt =
$this->bo->save($values,$action,$values_attribute);
@@ -722,19 +732,23 @@
}
phpgwapi_yui::tabview_setup('general_edit_tabview');
- $tabs['general'] = array('label' =>
lang('general'), 'link' => '#general');
- $attributes_groups =
$this->custom->get_attribute_groups('property', $this->acl_location,
$values['attributes']);
+ $attributes_groups =
$this->custom->get_attribute_groups($this->location_info['acl_app'],
$this->acl_location, $values['attributes']);
+ if((isset($attributes_groups[0]['id']) &&
$attributes_groups[0]['id'] > 0 ) || count($attributes_groups) > 1 )
+ {
+ $tabs['general'] = array('label'
=> lang('general'), 'link' => '#general');
+ }
+
$attributes = array();
foreach ($attributes_groups as $group)
{
- if(isset($group['attributes']))
+ if(isset($group['attributes']) &&
isset($tabs['general']))
{
$tabs[str_replace(' ', '_',
$group['name'])] = array('label' => $group['name'], 'link' => '#' .
str_replace(' ', '_', $group['name']));
$group['link'] = str_replace('
', '_', $group['name']);
- $attributes[] = $group;
}
+ $attributes[] = $group;
}
unset($attributes_groups);
unset($values['attributes']);
@@ -794,7 +808,7 @@
$appname = $this->location_info['name'];
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . "::{$appname}::{$function_msg}";
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
$GLOBALS['phpgw']->translation->translate($this->location_info['acl_app'],
array(), false, $this->location_info['acl_app']) .
"::{$appname}::{$function_msg}";
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
}
Modified: trunk/property/inc/class.uis_agreement.inc.php
===================================================================
--- trunk/property/inc/class.uis_agreement.inc.php 2011-02-04 15:03:18 UTC
(rev 6932)
+++ trunk/property/inc/class.uis_agreement.inc.php 2011-02-05 15:31:02 UTC
(rev 6933)
@@ -89,6 +89,7 @@
$this->vendor_id =
$this->bo->vendor_id;
$this->allrows =
$this->bo->allrows;
$this->member_id =
$this->bo->member_id;
+ $this->p_num =
$this->bo->p_num;
}
function save_sessiondata()
@@ -189,7 +190,8 @@
'filter' =>$this->filter,
'query' =>$this->query,
'role' => $this->role,
- 'member_id' =>
$this->member_id
+ 'member_id' =>
$this->member_id,
+ 'p_num' => $this->p_num
));
$datatable['config']['base_java_url'] =
"menuaction:'property.uis_agreement.index',"
@@ -198,6 +200,7 @@
."cat_id: '{$this->cat_id}',"
."filter:'{$this->filter}',"
."query:'{$this->query}',"
+ ."p_num: '{$this->p_num}',"
."role:'{$this->role}',"
."member_id:'{$this->member_id}'";
@@ -295,7 +298,7 @@
( // TEXT INPUT
'name'
=> 'query',
'id'
=> 'txt_query',
- 'value'
=> '',//$query,
+ 'value'
=> $this->query,
'type'
=> 'text',
'onkeypress' => 'return pulsar(event)',
'size'
=> 28,
@@ -341,7 +344,7 @@
}
$list = $this->bo->read();
-
+//_debug_array($list);
$uicols = $this->bo->uicols;
$j = 0;
$count_uicols_name = count($uicols['name']);
Modified: trunk/property/templates/base/files.xsl
===================================================================
--- trunk/property/templates/base/files.xsl 2011-02-04 15:03:18 UTC (rev
6932)
+++ trunk/property/templates/base/files.xsl 2011-02-05 15:31:02 UTC (rev
6933)
@@ -1,16 +1,16 @@
-<xsl:template name="file_list">
+<xsl:template name="file_list" xmlns:php="http://php.net/xsl";>
<tr>
<td width="19%" align="left" valign="top">
- <xsl:value-of select="//lang_files"/>
+ <xsl:value-of select="php:function('lang', 'files')" />
</td>
<td>
<table>
<tr class="th">
<td class="th_text" width="85%"
align="left">
- <xsl:value-of
select="lang_filename"/>
+ <xsl:value-of
select="php:function('lang', 'filename')" />
</td>
<td class="th_text" width="15%"
align="center">
- <xsl:value-of
select="lang_file_action"/>
+ <xsl:value-of
select="php:function('lang', 'Delete file')" />
</td>
</tr>
<xsl:for-each select="files" >
@@ -29,22 +29,23 @@
</xsl:choose>
</xsl:attribute>
<td align="left">
+ <xsl:variable
name="view_file_statustext"><xsl:value-of select="php:function('lang', 'click
to view file')" /></xsl:variable>
<xsl:choose>
<xsl:when
test="//link_to_files!=''">
<xsl:variable name="link_to_file"><xsl:value-of
select="//link_to_files"/>/<xsl:value-of select="directory"/>/<xsl:value-of
select="file_name"/></xsl:variable>
- <a
href="{$link_to_file}" target="_blank"
title="{//lang_view_file_statustext}"><xsl:value-of select="name"/></a>
+ <a
href="{$link_to_file}" target="_blank"
title="{$view_file_statustext}"><xsl:value-of select="name"/></a>
</xsl:when>
<xsl:otherwise>
<xsl:variable name="link_view_file"><xsl:value-of
select="//link_view_file"/>&file_name=<xsl:value-of
select="file_name"/></xsl:variable>
- <a
href="{$link_view_file}" target="_blank"
title="{//lang_view_file_statustext}"><xsl:value-of select="name"/></a>
+ <a
href="{$link_view_file}" target="_blank"
title="{$view_file_statustext}"><xsl:value-of select="name"/></a>
</xsl:otherwise>
</xsl:choose>
<xsl:text> </xsl:text>
</td>
<td align="center">
- <input type="checkbox"
name="values[file_action][]" value="{name}"
onMouseout="window.status='';return true;">
+ <input type="checkbox"
name="values[file_action][]" value="{name}">
<xsl:attribute
name="title">
-
<xsl:value-of select="//lang_file_action_statustext"/>
+
<xsl:value-of select="php:function('lang', 'Check to delete file')" />
</xsl:attribute>
</input>
</td>
@@ -55,16 +56,16 @@
</tr>
</xsl:template>
-<xsl:template name="file_list_view">
+<xsl:template name="file_list_view" xmlns:php="http://php.net/xsl";>
<tr>
<td align="left" valign="top">
- <xsl:value-of select="//lang_files"/>
+ <xsl:value-of select="php:function('lang', 'files')" />
</td>
<td>
<table>
<tr class="th">
<td class="th_text" width="85%"
align="left">
- <xsl:value-of
select="lang_filename"/>
+ <xsl:value-of
select="php:function('lang', 'filename')" />
</td>
</tr>
<xsl:for-each select="files" >
@@ -83,14 +84,15 @@
</xsl:choose>
</xsl:attribute>
<td align="left">
+ <xsl:variable
name="view_file_statustext"><xsl:value-of select="php:function('lang', 'click
to view file')" /></xsl:variable>
<xsl:choose>
<xsl:when
test="//link_to_files!=''">
<xsl:variable name="link_to_file"><xsl:value-of
select="//link_to_files"/>/<xsl:value-of select="directory"/>/<xsl:value-of
select="file_name"/></xsl:variable>
- <a
href="{$link_to_file}" target="_blank"
title="{//lang_view_file_statustext}"><xsl:value-of select="name"/></a>
+ <a
href="{$link_to_file}" target="_blank"
title="{$view_file_statustext}"><xsl:value-of select="name"/></a>
</xsl:when>
<xsl:otherwise>
<xsl:variable name="link_view_file"><xsl:value-of
select="//link_view_file"/>&file_name=<xsl:value-of
select="file_name"/></xsl:variable>
- <a
href="{$link_view_file}" target="_blank"
title="{//lang_view_file_statustext}"><xsl:value-of select="name"/></a>
+ <a
href="{$link_view_file}" target="_blank"
title="{$view_file_statustext}"><xsl:value-of select="name"/></a>
</xsl:otherwise>
</xsl:choose>
<xsl:text> </xsl:text>
@@ -105,12 +107,12 @@
<xsl:template name="file_upload" xmlns:php="http://php.net/xsl";>
<tr>
<td valign="top">
- <xsl:value-of select="lang_upload_file"/>
+ <xsl:value-of select="php:function('lang', 'upload
file')" />
</td>
<td>
- <input type="file" name="file" size="40"
onMouseout="window.status='';return true;">
+ <input type="file" name="file" size="40">
<xsl:attribute name="title">
- <xsl:value-of
select="//lang_file_statustext"/>
+ <xsl:value-of
select="php:function('lang', 'Select file to upload')" />
</xsl:attribute>
</input>
</td>
| [Prev in Thread] | Current Thread | [Next in Thread] |