[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7367] Merge 7362:7366 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [7367] Merge 7362:7366 from trunk |
|
Date: |
Fri, 10 Jun 2011 09:23:09 +0000 |
Revision: 7367
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7367
Author: sigurdne
Date: 2011-06-10 09:23:09 +0000 (Fri, 10 Jun 2011)
Log Message:
-----------
Merge 7362:7366 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/inc/class.uiallocation.inc.php
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation.inc.php
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation_export_file.inc.php
branches/Version-1_0-branch/booking/inc/class.uidocument.inc.php
branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
branches/Version-1_0-branch/sms/inc/class.sosms.inc.php
Added Paths:
-----------
branches/Version-1_0-branch/booking/js/booking/allocation_list.js
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366
Modified: branches/Version-1_0-branch/booking/inc/class.uiallocation.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uiallocation.inc.php
2011-06-10 09:19:59 UTC (rev 7366)
+++ branches/Version-1_0-branch/booking/inc/class.uiallocation.inc.php
2011-06-10 09:23:09 UTC (rev 7367)
@@ -36,6 +36,7 @@
if(phpgw::get_var('phpgw_return_as') == 'json') {
return $this->index_json();
}
+ self::add_javascript('booking', 'booking',
'allocation_list.js');
self::add_javascript('booking', 'booking',
'datatable.js');
phpgwapi_yui::load_widget('datatable');
phpgwapi_yui::load_widget('paginator');
@@ -44,20 +45,36 @@
'form' => array(
'toolbar' => array(
'item' => array(
- array('type' =>
'filter',
- 'name' =>
'buildings',
- 'text' => lang('Building').':',
- 'list' => $this->bo->so->get_buildings(),
+ array('type' =>
'autocomplete',
+ 'name' =>
'building',
+ 'ui' =>
'building',
+ 'text' =>
lang('Building').':',
+ 'onItemSelect'
=> 'updateBuildingFilter',
+
'onClearSelection' => 'clearBuildingFilter'
),
+ array('type' =>
'autocomplete',
+ 'name' =>
'season',
+ 'ui' =>
'season',
+ 'text' =>
lang('Season').':',
+
'requestGenerator' => 'requestWithBuildingFilter',
+ ),
array('type' =>
'filter',
'name' =>
'organizations',
'text' => lang('Organization').':',
'list' => $this->bo->so->get_organizations(),
),
# array('type' =>
'filter',
+# 'name' =>
'buildings',
+# 'text' => lang('Building').':',
+# 'list' => $this->bo->so->get_buildings(),
+# 'onItemSelect'
=> 'updateBuildingFilter',
+#
'onClearSelection' => 'clearBuildingFilter'
+# ),
+# array('type' =>
'filter',
# 'name' =>
'seasons',
# 'text' => lang('Season').':',
# 'list' =>
$this->bo->so->get_seasons($build_id),
+#
'requestGenerator' => 'requestWithBuildingFilter',
# ),
array('type' => 'text',
'name' =>
'query'
@@ -119,7 +136,7 @@
'href' => self::link(array('menuaction'
=> 'booking.uiallocation.add'))
));
}
-
+ $data['filters'] = $this->export_filters;
self::render_template('datatable', $data);
}
@@ -131,9 +148,9 @@
unset($filters['organization_id']);
unset($filters['season_id']);
} else {
- $testdata = phpgw::get_var('buildings', 'int', 'REQUEST',
null);
+ $testdata = phpgw::get_var('filter_building_id', 'int',
'REQUEST', null);
if ($testdata != 0) {
- $filters['building_name'] =
$this->bo->so->get_building(phpgw::get_var('buildings', 'int', 'REQUEST',
null));
+ $filters['building_name'] =
$this->bo->so->get_building(phpgw::get_var('filter_building_id', 'int',
'REQUEST', null));
} else {
unset($filters['building_name']);
}
@@ -143,9 +160,9 @@
} else {
unset($filters['organization_id']);
}
- $testdata3 = phpgw::get_var('seasons', 'int', 'REQUEST',
null);
+ $testdata3 = phpgw::get_var('filter_season_id', 'int',
'REQUEST', null);
if ($testdata3 != 0) {
- $filters['season_id'] =
$this->bo->so->get_season(phpgw::get_var('seasons', 'int', 'REQUEST', null));
+ $filters['season_id'] =
$this->bo->so->get_season(phpgw::get_var('filter_season_id', 'int', 'REQUEST',
null));
} else {
unset($filters['season_id']);
}
Modified:
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation.inc.php
===================================================================
---
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation.inc.php
2011-06-10 09:19:59 UTC (rev 7366)
+++
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation.inc.php
2011-06-10 09:23:09 UTC (rev 7367)
@@ -152,6 +152,7 @@
),
'datatable' => array(
'source' => $this->link_to('index',
array('phpgw_return_as' => 'json')),
+ 'sorted_by' => array('key' => 'id',
'dir' => 'desc'),
'field' => array(
array(
'key' => 'id',
@@ -380,7 +381,9 @@
$this->add_default_display_data($reservation);
$this->install_customer_identifier_ui($reservation);
$show_edit_button = false;
- if (
isset($GLOBALS['phpgw_info']['user']['apps']['admin']) )
+ $building_role =
$this->bo->accessable_buildings($GLOBALS['phpgw_info']['user']['id']);
+
+ if (
isset($GLOBALS['phpgw_info']['user']['apps']['admin']) ||
in_array($reservation['building_id'],$building_role))
{
$show_edit_button = true;
}
@@ -423,11 +426,13 @@
public function edit() {
//TODO: Display hint to user about primary type of
customer identifier
- if
(!isset($GLOBALS['phpgw_info']['user']['apps']['admin']) )
+ $building_role =
$this->bo->accessable_buildings($GLOBALS['phpgw_info']['user']['id']);
+ $reservation =
$this->bo->read_single(phpgw::get_var('id', 'GET'));
+
+ if (
!isset($GLOBALS['phpgw_info']['user']['apps']['admin']) &&
!in_array($reservation['building_id'],$building_role))
{
$this->redirect_to('show', array('id' =>
phpgw::get_var('id', 'GET')));
}
- $reservation =
$this->bo->read_single(phpgw::get_var('id', 'GET'));
if (((int)$reservation['exported']) !== 0) {
//Cannot edit already exported reservation
Modified:
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
===================================================================
---
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
2011-06-10 09:19:59 UTC (rev 7366)
+++
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation_export.inc.php
2011-06-10 09:23:09 UTC (rev 7367)
@@ -113,6 +113,7 @@
),
'datatable' => array(
'source' => $this->link_to('index',
array('phpgw_return_as' => 'json')),
+ 'sorted_by' => array('key' => 'id',
'dir' => 'desc'),
'field' => array(
array(
'key' => 'id',
Modified:
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation_export_file.inc.php
===================================================================
---
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation_export_file.inc.php
2011-06-10 09:19:59 UTC (rev 7366)
+++
branches/Version-1_0-branch/booking/inc/class.uicompleted_reservation_export_file.inc.php
2011-06-10 09:23:09 UTC (rev 7367)
@@ -78,7 +78,7 @@
),
'datatable' => array(
'source' => $this->link_to('index',
array('phpgw_return_as' => 'json')),
- 'sorted_by' => array('key' =>
'created_on', 'dir' => 'desc'),
+ 'sorted_by' => array('key' => 'id',
'dir' => 'desc'),
'field' => array(
array(
'key' => 'id',
Modified: branches/Version-1_0-branch/booking/inc/class.uidocument.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/inc/class.uidocument.inc.php
2011-06-10 09:19:59 UTC (rev 7366)
+++ branches/Version-1_0-branch/booking/inc/class.uidocument.inc.php
2011-06-10 09:23:09 UTC (rev 7367)
@@ -295,7 +295,6 @@
$errors = $this->bo->validate($document);
if(!$errors)
{
- echo
"<pre>";print_r($document);print_r($errors);exit;
try {
$receipt =
$this->bo->add($document);
Copied: branches/Version-1_0-branch/booking/js/booking/allocation_list.js (from
rev 7366, trunk/booking/js/booking/allocation_list.js)
===================================================================
--- branches/Version-1_0-branch/booking/js/booking/allocation_list.js
(rev 0)
+++ branches/Version-1_0-branch/booking/js/booking/allocation_list.js
2011-06-10 09:23:09 UTC (rev 7367)
@@ -0,0 +1,15 @@
+var seasonFilterBuildingId = false;
+
+function updateBuildingFilter(sType, aArgs) {
+ YAHOO.util.Dom.get("filter_season_name").value = "";
+ YAHOO.util.Dom.get("filter_season_id").value = "";
+ seasonFilterBuildingId = aArgs[2].id;
+}
+
+function clearBuildingFilter() {
+ seasonFilterBuildingId = false;
+}
+
+function requestWithBuildingFilter(sQuery) {
+ return 'query=' + sQuery + (seasonFilterBuildingId ?
'&filter_building_id='+seasonFilterBuildingId : '');
+}
Modified: branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
2011-06-10 09:19:59 UTC (rev 7366)
+++ branches/Version-1_0-branch/property/inc/class.uis_agreement.inc.php
2011-06-10 09:23:09 UTC (rev 7367)
@@ -1391,13 +1391,13 @@
{
if ($link_to_files != '')
{
- $content_files[$z]['file_name'] = '<a
href="'.$link_to_files.'/'.$values['files'][$z]['directory'].'/'.$values['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view file').'"
style="cursor:help">'.$values['files'][$z]['name'].'</a>';
+ $content_files[$z]['file_name'] = '<a
href="'.$link_to_files.'/'.$values['files'][$z]['directory'].'/'.$values['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view
file').'">'.$values['files'][$z]['name'].'</a>';
}
else
{
- $content_files[$z]['file_name'] = '<a
href="'.$link_view_file.'&file_name='.$values['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view file').'"
style="cursor:help">'.$values['files'][$z]['name'].'</a>';
+ $content_files[$z]['file_name'] = '<a
href="'.$link_view_file.'&file_name='.$values['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view
file').'">'.$values['files'][$z]['name'].'</a>';
}
- $content_files[$z]['delete_file'] = '<input
type="checkbox" name="values[file_action][]"
value="'.$values['files'][$z]['name'].'" title="'.lang('Check to delete
file').'" style="cursor:help">';
+ $content_files[$z]['delete_file'] = '<input
type="checkbox" name="values[file_action][]"
value="'.$values['files'][$z]['name'].'" title="'.lang('Check to delete
file').'">';
}
$datavalues[2] = array
@@ -2452,23 +2452,34 @@
'footer'
=> 0
);
+ $td_count = 0;
+ $ColumnDefs_data = array();
+ if(isset($uicols['input_type']) &&
$uicols['input_type'])
+ {
+ foreach($uicols['input_type'] as $key =>
$input_type)
+ {
+ if($input_type != 'hidden')
+ {
+ $ColumnDefs_data[] = array
+ (
+ 'key'
=> $uicols['name'][$key],
+ 'label'
=> $uicols['descr'][$key],
+ 'sortable'
=> true,
+ 'resizeable'
=> true
+ );
+ $td_count ++;
+ }
+ }
+ }
+
$myColumnDefs[1] = array
(
'name' => "1",
- 'values' =>
json_encode(array( array('key' =>
'item_id','label'=>lang('ID'),'sortable'=>true,'resizeable'=>true),
-
array('key' =>
'location_code','label'=>lang('Location'),'sortable'=>true,'resizeable'=>true),
-
array('key' =>
'address','label'=>lang('Address'),'sortable'=>true,'resizeable'=>true),
-
array('key' =>
'p_entity_id','label'=>lang('entity_id'),'sortable'=>true,'resizeable'=>true),
-
array('key' =>
'p_cat_id','label'=>lang('cat_id'),'sortable'=>true,'resizeable'=>true),
-
array('key' =>
'p_num','label'=>lang('entity_num'),'sortable'=>true,'resizeable'=>true),
-
array('key' =>
'cost','label'=>lang('Cost'),'sortable'=>true,'resizeable'=>true),
-
array('key' =>
'this_index','label'=>lang('index'),'sortable'=>true,'resizeable'=>true),
-
array('key' =>
'index_count','label'=>lang('index_count'),'sortable'=>true,'resizeable'=>true),
-
array('key' =>
'index_date','label'=>lang('Date'),'sortable'=>true,'resizeable'=>true),
-
array('key' =>
'enhet','label'=>lang('Enhet'),'sortable'=>true,'resizeable'=>true),
-
array('key' =>
'quantity','label'=>lang('mengde'),'sortable'=>true,'resizeable'=>true)))
+ 'values' =>
json_encode($ColumnDefs_data)
);
+ unset($ColumnDefs_data);
+
//---datatable2
settings---------------------------------------------------
$link_view_file =
$GLOBALS['phpgw']->link('/index.php',$link_file_data);
@@ -2477,11 +2488,11 @@
{
if ($link_to_files != '')
{
- $content_files[$z]['file_name'] = '<a
href="'.$link_to_files.'/'.$s_agreement['files'][$z]['directory'].'/'.$s_agreement['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view file').'"
style="cursor:help">'.$s_agreement['files'][$z]['name'].'</a>';
+ $content_files[$z]['file_name'] = '<a
href="'.$link_to_files.'/'.$s_agreement['files'][$z]['directory'].'/'.$s_agreement['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view
file').'">'.$s_agreement['files'][$z]['name'].'</a>';
}
else
{
- $content_files[$z]['file_name'] = '<a
href="'.$link_view_file.'&file_name='.$s_agreement['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view file').'"
style="cursor:help">'.$s_agreement['files'][$z]['name'].'</a>';
+ $content_files[$z]['file_name'] = '<a
href="'.$link_view_file.'&file_name='.$s_agreement['files'][$z]['file_name'].'"
target="_blank" title="'.lang('click to view
file').'">'.$s_agreement['files'][$z]['name'].'</a>';
}
}
Modified: branches/Version-1_0-branch/sms/inc/class.sosms.inc.php
===================================================================
--- branches/Version-1_0-branch/sms/inc/class.sosms.inc.php 2011-06-10
09:19:59 UTC (rev 7366)
+++ branches/Version-1_0-branch/sms/inc/class.sosms.inc.php 2011-06-10
09:23:09 UTC (rev 7367)
@@ -114,7 +114,7 @@
function read_outbox($data)
{
- $query = isset($data['start']) &&
$data['start'] ? (int)$data['start']:0;
+ $start = isset($data['start']) &&
$data['start'] ? (int)$data['start']:0;
$query =
isset($data['query'])?$data['query']:'';
$sort =
isset($data['sort'])?$data['sort']:'DESC';
$order =
isset($data['order'])?$data['order']:'';
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7367] Merge 7362:7366 from trunk,
Sigurd Nes <=