[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14987] set allrows on download
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [14987] set allrows on download |
|
Date: |
Mon, 9 May 2016 13:02:56 +0000 (UTC) |
Revision: 14987
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14987
Author: sigurdne
Date: 2016-05-09 13:02:55 +0000 (Mon, 09 May 2016)
Log Message:
-----------
set allrows on download
Modified Paths:
--------------
trunk/property/inc/class.boworkorder.inc.php
trunk/property/inc/class.uiadmin_entity.inc.php
trunk/property/inc/class.uiadmin_location.inc.php
trunk/property/inc/class.uiagreement.inc.php
trunk/property/inc/class.uiasync.inc.php
trunk/property/inc/class.uibudget.inc.php
trunk/property/inc/class.uicondition_survey.inc.php
trunk/property/inc/class.uicustom.inc.php
trunk/property/inc/class.uidocument.inc.php
trunk/property/inc/class.uidocument2.inc.php
trunk/property/inc/class.uientity.inc.php
trunk/property/inc/class.uievent.inc.php
trunk/property/inc/class.uigab.inc.php
trunk/property/inc/class.uigallery.inc.php
trunk/property/inc/class.uigeneric.inc.php
trunk/property/inc/class.uigeneric_document.inc.php
trunk/property/inc/class.uiinvestment.inc.php
trunk/property/inc/class.uiinvoice.inc.php
trunk/property/inc/class.uijasper.inc.php
trunk/property/inc/class.uilocation.inc.php
trunk/property/inc/class.uipricebook.inc.php
trunk/property/inc/class.uiproject.inc.php
trunk/property/inc/class.uirequest.inc.php
trunk/property/inc/class.uiresponsible.inc.php
trunk/property/inc/class.uis_agreement.inc.php
trunk/property/inc/class.uitemplate.inc.php
trunk/property/inc/class.uitenant_claim.inc.php
trunk/property/inc/class.uitts.inc.php
trunk/property/inc/class.uiworkorder.inc.php
Modified: trunk/property/inc/class.boworkorder.inc.php
===================================================================
--- trunk/property/inc/class.boworkorder.inc.php 2016-05-08 13:03:04 UTC
(rev 14986)
+++ trunk/property/inc/class.boworkorder.inc.php 2016-05-09 13:02:55 UTC
(rev 14987)
@@ -53,7 +53,7 @@
'get_category' => true
);
- function __construct( $session = false )
+ function __construct( )
{
$this->so = CreateObject('property.soworkorder');
$this->bocommon = CreateObject('property.bocommon');
@@ -61,14 +61,6 @@
$this->cats->supress_info = true;
$this->interlink = & $this->so->interlink;
- $obligation = phpgw::get_var('obligation', 'bool');
-
- if ($session && !$obligation)
- {
- $this->read_sessiondata();
- $this->use_session = true;
- }
-
$default_filter_year = 'all';
if
(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['default_project_filter_year']))
@@ -88,111 +80,29 @@
}
}
- $start = phpgw::get_var('start', 'int', 'REQUEST', 0);
- $query = phpgw::get_var('query');
- $sort = phpgw::get_var('sort');
- $order = phpgw::get_var('order');
- $filter = phpgw::get_var('filter', 'int');
- $filter_year = phpgw::get_var('filter_year', 'string',
'REQUEST', $default_filter_year);
- $cat_id = phpgw::get_var('cat_id', 'int');
- $status_id = phpgw::get_var('status_id');
- $wo_hour_cat_id = phpgw::get_var('wo_hour_cat_id',
'int');
- $start_date = phpgw::get_var('start_date');
- $end_date = phpgw::get_var('end_date');
- $b_group = phpgw::get_var('b_group');
- $ecodimb = phpgw::get_var('ecodimb');
- $paid = phpgw::get_var('paid', 'bool');
- $b_account = phpgw::get_var('b_account');
- $district_id = phpgw::get_var('district_id', 'int');
- $criteria_id = phpgw::get_var('criteria_id', 'int');
- $this->allrows = phpgw::get_var('allrows', 'bool');
- $this->obligation = $obligation;
+ $this->start = phpgw::get_var('start', 'int',
'REQUEST', 0);
+ $this->query = phpgw::get_var('query');
+ $this->sort = phpgw::get_var('sort');
+ $this->order = phpgw::get_var('order');
+ $this->filter = phpgw::get_var('filter', 'int');
+ $this->filter_year = phpgw::get_var('filter_year',
'string', 'REQUEST', $default_filter_year);
+ $this->cat_id = phpgw::get_var('cat_id', 'int');
+ $this->status_id = phpgw::get_var('status_id');
+ $this->wo_hour_cat_id =
phpgw::get_var('wo_hour_cat_id', 'int');
+ $this->start_date = phpgw::get_var('filter_start_date');
+ $this->end_date = phpgw::get_var('filter_end_date');
+ $this->b_group = phpgw::get_var('b_group');
+ $this->ecodimb = phpgw::get_var('ecodimb');
+ $this->paid = phpgw::get_var('paid', 'bool');
+ $this->b_account = phpgw::get_var('b_account');
+ $this->district_id = phpgw::get_var('district_id',
'int');
+ $this->criteria_id = phpgw::get_var('criteria_id',
'int');
+ $this->this->allrows = phpgw::get_var('allrows',
'bool');
+ $this->obligation = phpgw::get_var('obligation',
'bool');
- $this->start = $start ? $start : 0;
- $this->filter_year = $filter_year;
-
- if (array_key_exists('district_id', $_POST) ||
array_key_exists('district_id', $_GET))
- {
- $this->district_id = $district_id;
- }
-
- $this->paid = $paid;
-
- $this->b_group = $b_group;
- $this->ecodimb = $ecodimb;
- $this->b_account = $b_account;
-
- if (array_key_exists('query', $_POST) ||
array_key_exists('query', $_GET))
- {
- $this->query = $query;
- }
- if (array_key_exists('filter', $_POST) ||
array_key_exists('filter', $_GET))
- {
- $this->filter = $filter;
- }
- if (isset($sort))
- {
- $this->sort = $sort;
- }
- if (isset($order))
- {
- $this->order = $order;
- }
- if (array_key_exists('cat_id', $_POST) ||
array_key_exists('cat_id', $_GET))
- {
- $this->cat_id = $cat_id;
- }
- if (array_key_exists('criteria_id', $_POST) ||
array_key_exists('criteria_id', $_GET))
- {
- $this->criteria_id = $criteria_id;
- }
- if (array_key_exists('status_id', $_POST) ||
array_key_exists('status_id', $_GET))
- {
- $this->status_id = $status_id;
- }
- if (array_key_exists('wo_hour_cat_id', $_POST) ||
array_key_exists('wo_hour_cat_id', $_GET))
- {
- $this->wo_hour_cat_id = $wo_hour_cat_id;
- }
- if (array_key_exists('start_date', $_POST) ||
array_key_exists('start_date', $_GET))
- {
- $this->start_date = $start_date;
- }
- if (array_key_exists('end_date', $_POST) ||
array_key_exists('end_date', $_GET))
- {
- $this->end_date = $end_date;
- }
}
- function read_sessiondata()
- {
- $data =
$GLOBALS['phpgw']->session->appsession('session_data', 'workorder');
- $this->start = isset($data['start']) ? $data['start'] :
'';
- $this->query = isset($data['query']) ? $data['query'] :
'';
- $this->filter = isset($data['filter']) ?
$data['filter'] : '';
- $this->sort = isset($data['sort']) ? $data['sort'] : '';
- $this->order = isset($data['order']) ? $data['order'] :
'';
- $this->cat_id = isset($data['cat_id']) ?
$data['cat_id'] : '';
- $this->status_id = isset($data['status_id']) ?
$data['status_id'] : '';
- $this->wo_hour_cat_id = isset($data['wo_hour_cat_id'])
? $data['wo_hour_cat_id'] : '';
- // $this->start_date =
isset($data['start_date']) ? $data['start_date']: '';
- // $this->end_date =
isset($data['end_date']) ? $data['end_date']: '';
- // $this->b_group =
isset($data['b_group']) ? $data['b_group']: '';
- // $this->paid
= isset($data['paid']) ? $data['paid']: '';
- // $this->b_account =
isset($data['b_account']) ? $data['b_account']: '';
- $this->district_id = isset($data['district_id']) ?
$data['district_id'] : '';
- $this->criteria_id = isset($data['criteria_id']) ?
$data['criteria_id'] : '';
- }
-
- function save_sessiondata( $data )
- {
- if ($this->use_session)
- {
-
$GLOBALS['phpgw']->session->appsession('session_data', 'workorder', $data);
- }
- }
-
public function get_category()
{
$cat_id = phpgw::get_var('cat_id', 'int');
Modified: trunk/property/inc/class.uiadmin_entity.inc.php
===================================================================
--- trunk/property/inc/class.uiadmin_entity.inc.php 2016-05-08 13:03:04 UTC
(rev 14986)
+++ trunk/property/inc/class.uiadmin_entity.inc.php 2016-05-09 13:02:55 UTC
(rev 14987)
@@ -265,13 +265,15 @@
break;
}
+ $export = phpgw::get_var('export', 'bool');
+
$params = array(
'start' => $this->start,
'results' => phpgw::get_var('length', 'int',
'REQUEST', 0),
'query' => $search['value'],
'sort' => $order[0]['dir'],
'order' =>
$columns[$order[0]['column']]['data'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'entity_id' => $entity_id,
'cat_id' => $cat_id
);
@@ -304,7 +306,7 @@
$new_values[] = $value;
}
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $new_values;
}
Modified: trunk/property/inc/class.uiadmin_location.inc.php
===================================================================
--- trunk/property/inc/class.uiadmin_location.inc.php 2016-05-08 13:03:04 UTC
(rev 14986)
+++ trunk/property/inc/class.uiadmin_location.inc.php 2016-05-09 13:02:55 UTC
(rev 14987)
@@ -307,13 +307,14 @@
break;
}
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'start' => $this->start,
'results' => phpgw::get_var('length', 'int',
'REQUEST', 0),
'query' => $search['value'],
'sort' => $order[0]['dir'],
'order' =>
$columns[$order[0]['column']]['data'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'type_id' => $id_type
);
@@ -342,7 +343,7 @@
$new_values[] = $value;
}
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $new_values;
}
Modified: trunk/property/inc/class.uiagreement.inc.php
===================================================================
--- trunk/property/inc/class.uiagreement.inc.php 2016-05-08 13:03:04 UTC
(rev 14986)
+++ trunk/property/inc/class.uiagreement.inc.php 2016-05-09 13:02:55 UTC
(rev 14987)
@@ -438,6 +438,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
@@ -445,7 +446,7 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'filter' => $this->filter,
'cat_id' => $this->cat_id,
'member_id' => $this->member_id,
@@ -458,7 +459,7 @@
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uiasync.inc.php
===================================================================
--- trunk/property/inc/class.uiasync.inc.php 2016-05-08 13:03:04 UTC (rev
14986)
+++ trunk/property/inc/class.uiasync.inc.php 2016-05-09 13:02:55 UTC (rev
14987)
@@ -284,6 +284,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
@@ -291,7 +292,7 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
);
$result_objects = array();
@@ -310,7 +311,7 @@
$entry['data'] = @implode (',',$method_data);
}
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uibudget.inc.php
===================================================================
--- trunk/property/inc/class.uibudget.inc.php 2016-05-08 13:03:04 UTC (rev
14986)
+++ trunk/property/inc/class.uibudget.inc.php 2016-05-09 13:02:55 UTC (rev
14987)
@@ -601,6 +601,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$order_field = '';
switch ($columns[$order[0]['column']]['data'])
@@ -621,12 +622,12 @@
'query' => $search['value'],
'order' => $order_field,
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export
);
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
@@ -765,6 +766,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$order_field = '';
switch ($columns[$order[0]['column']]['data'])
@@ -785,12 +787,12 @@
'query' => $search['value'],
'order' => $order_field,
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export
);
$values = $this->bo->read_basis($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
@@ -909,6 +911,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
@@ -916,12 +919,12 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export
);
$location_list = $this->bo->read_obligations($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $location_list;
}
Modified: trunk/property/inc/class.uicondition_survey.inc.php
===================================================================
--- trunk/property/inc/class.uicondition_survey.inc.php 2016-05-08 13:03:04 UTC
(rev 14986)
+++ trunk/property/inc/class.uicondition_survey.inc.php 2016-05-09 13:02:55 UTC
(rev 14987)
@@ -287,8 +287,8 @@
$search = phpgw::get_var('search');
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
+ $export = phpgw::get_var('export', 'bool');
-
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
'results' => phpgw::get_var('length', 'int',
'REQUEST', 0),
@@ -296,14 +296,14 @@
'sort' => phpgw::get_var('sort'),
'dir' => phpgw::get_var('dir'),
'cat_id' => phpgw::get_var('cat_id', 'int',
'REQUEST', 0),
- 'allrows' => phpgw::get_var('length', 'int') ==
-1
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export
);
$result_objects = array();
$result_count = 0;
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uicustom.inc.php
===================================================================
--- trunk/property/inc/class.uicustom.inc.php 2016-05-08 13:03:04 UTC (rev
14986)
+++ trunk/property/inc/class.uicustom.inc.php 2016-05-09 13:02:55 UTC (rev
14987)
@@ -229,6 +229,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
@@ -236,7 +237,7 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'filter' => $this->filter,
'cat_id' => $this->cat_id
);
@@ -246,7 +247,7 @@
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
@@ -571,6 +572,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
@@ -578,14 +580,14 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'filter' => $this->filter,
'custom_id' => $custom_id
);
$values = $this->bo->read_custom($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uidocument.inc.php
===================================================================
--- trunk/property/inc/class.uidocument.inc.php 2016-05-08 13:03:04 UTC (rev
14986)
+++ trunk/property/inc/class.uidocument.inc.php 2016-05-09 13:02:55 UTC (rev
14987)
@@ -126,6 +126,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
@@ -133,12 +134,12 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
);
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
@@ -343,6 +344,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$location_code = phpgw::get_var('location_code');
if ($this->query_location)
@@ -356,13 +358,13 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'location_code' => $location_code
);
$values = $this->bo->read_at_location($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uidocument2.inc.php
===================================================================
--- trunk/property/inc/class.uidocument2.inc.php 2016-05-08 13:03:04 UTC
(rev 14986)
+++ trunk/property/inc/class.uidocument2.inc.php 2016-05-09 13:02:55 UTC
(rev 14987)
@@ -283,6 +283,7 @@
$draw = phpgw::get_var('draw', 'int');
$columns = $this->_get_columns();
+ $export = phpgw::get_var('export', 'bool');
$params = array
@@ -292,12 +293,12 @@
'query' => $search['value'],
'order' => $order,
'cat_id' => phpgw::get_var('cat_id', 'int',
'REQUEST', 0),
- 'allrows' => phpgw::get_var('length', 'int') ==
-1
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
);
$values = $this->bo->read2(array('columns' => $columns,
'params' => $params));
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php 2016-05-08 13:03:04 UTC (rev
14986)
+++ trunk/property/inc/class.uientity.inc.php 2016-05-09 13:02:55 UTC (rev
14987)
@@ -491,6 +491,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
@@ -498,13 +499,13 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'start_date' => $start_date,
'end_date' => $end_date
);
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uievent.inc.php
===================================================================
--- trunk/property/inc/class.uievent.inc.php 2016-05-08 13:03:04 UTC (rev
14986)
+++ trunk/property/inc/class.uievent.inc.php 2016-05-09 13:02:55 UTC (rev
14987)
@@ -386,6 +386,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array
(
@@ -394,7 +395,7 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'start_date' => $start_date,
'end_date' => $end_date,
'location_id' => $this->location_id,
@@ -403,7 +404,7 @@
);
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uigab.inc.php
===================================================================
--- trunk/property/inc/class.uigab.inc.php 2016-05-08 13:03:04 UTC (rev
14986)
+++ trunk/property/inc/class.uigab.inc.php 2016-05-09 13:02:55 UTC (rev
14987)
@@ -400,6 +400,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
@@ -407,7 +408,7 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'location_code' => $location_code ?
$location_code : $search['value'],
'gaards_nr' => $gaards_nr,
'bruksnr' => $bruksnr,
@@ -529,7 +530,7 @@
}
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uigallery.inc.php
===================================================================
--- trunk/property/inc/class.uigallery.inc.php 2016-05-08 13:03:04 UTC (rev
14986)
+++ trunk/property/inc/class.uigallery.inc.php 2016-05-09 13:02:55 UTC (rev
14987)
@@ -447,6 +447,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
if ($start_date && empty($end_date))
{
@@ -460,7 +461,7 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'location_id' => $this->location_id,
'user_id' => $this->user_id,
'mime_type' => $this->mime_type,
@@ -474,7 +475,7 @@
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uigeneric.inc.php
===================================================================
--- trunk/property/inc/class.uigeneric.inc.php 2016-05-08 13:03:04 UTC (rev
14986)
+++ trunk/property/inc/class.uigeneric.inc.php 2016-05-09 13:02:55 UTC (rev
14987)
@@ -474,6 +474,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
@@ -483,7 +484,7 @@
'sort' => $order[0]['dir'],
'dir' => $order[0]['dir'],
'cat_id' => phpgw::get_var('cat_id', 'int',
'REQUEST', 0),
- 'allrows' => phpgw::get_var('length', 'int') ==
-1
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
);
foreach ($this->location_info['fields'] as $field)
@@ -498,7 +499,7 @@
$result_count = 0;
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uigeneric_document.inc.php
===================================================================
--- trunk/property/inc/class.uigeneric_document.inc.php 2016-05-08 13:03:04 UTC
(rev 14986)
+++ trunk/property/inc/class.uigeneric_document.inc.php 2016-05-09 13:02:55 UTC
(rev 14987)
@@ -254,6 +254,7 @@
$search = phpgw::get_var('search');
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
@@ -263,14 +264,14 @@
'sort' => phpgw::get_var('sort'),
'dir' => phpgw::get_var('dir'),
'cat_id' => phpgw::get_var('cat_id', 'int',
'REQUEST', 0),
- 'allrows' => phpgw::get_var('length', 'int') ==
-1
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export
);
$result_objects = array();
$result_count = 0;
$values = array(); //$this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uiinvestment.inc.php
===================================================================
--- trunk/property/inc/class.uiinvestment.inc.php 2016-05-08 13:03:04 UTC
(rev 14986)
+++ trunk/property/inc/class.uiinvestment.inc.php 2016-05-09 13:02:55 UTC
(rev 14987)
@@ -147,6 +147,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$order[0]['column'] = 2;
$order[0]['dir'] = "desc";
@@ -160,7 +161,7 @@
'filter' => $this->filter,
'cat_id' => $this->cat_id,
'part_of_town_id' => $this->part_of_town_id,
- 'allrows' => phpgw::get_var('length', 'int') ==
-1
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export
);
$investment_list = $this->bo->read($params);
@@ -216,7 +217,7 @@
$counter++;
}
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $content;
}
Modified: trunk/property/inc/class.uiinvoice.inc.php
===================================================================
--- trunk/property/inc/class.uiinvoice.inc.php 2016-05-08 13:03:04 UTC (rev
14986)
+++ trunk/property/inc/class.uiinvoice.inc.php 2016-05-09 13:02:55 UTC (rev
14987)
@@ -933,6 +933,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array
(
@@ -941,7 +942,7 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'start_date' => $start_date,
'end_date' => $end_date,
'paid' => $paid,
@@ -956,7 +957,7 @@
$invoice_list = $this->bo->read_invoice($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $invoice_list;
}
Modified: trunk/property/inc/class.uijasper.inc.php
===================================================================
--- trunk/property/inc/class.uijasper.inc.php 2016-05-08 13:03:04 UTC (rev
14986)
+++ trunk/property/inc/class.uijasper.inc.php 2016-05-09 13:02:55 UTC (rev
14987)
@@ -454,6 +454,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
@@ -461,7 +462,7 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'app' => $this->app
);
@@ -470,7 +471,7 @@
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uilocation.inc.php
===================================================================
--- trunk/property/inc/class.uilocation.inc.php 2016-05-08 13:03:04 UTC (rev
14986)
+++ trunk/property/inc/class.uilocation.inc.php 2016-05-09 13:02:55 UTC (rev
14987)
@@ -113,6 +113,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
@@ -121,12 +122,12 @@
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
'dir' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'lookup_tenant' => $lookup_tenant
);
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uipricebook.inc.php
===================================================================
--- trunk/property/inc/class.uipricebook.inc.php 2016-05-08 13:03:04 UTC
(rev 14986)
+++ trunk/property/inc/class.uipricebook.inc.php 2016-05-09 13:02:55 UTC
(rev 14987)
@@ -157,6 +157,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array
(
@@ -167,7 +168,7 @@
'sort' => $order[0]['dir'],
'filter' => $this->filter,
'cat_id' => $this->cat_id,
- 'allrows' => phpgw::get_var('length', 'int') ==
-1
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
);
$pricebook_list = $this->bo->read($params);
@@ -206,7 +207,7 @@
}
}
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $content;
}
@@ -462,6 +463,7 @@
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
$cat_id = phpgw::get_var('cat_id');
+ $export = phpgw::get_var('export', 'bool');
switch ($columns[$order[0]['column']]['data'])
{
@@ -481,12 +483,12 @@
'sort' => $order[0]['dir'],
'filter' => $this->filter,
'cat_id' => $cat_id,
- 'allrows' => phpgw::get_var('length', 'int') ==
-1
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
);
$values = $this->bo->read_agreement_group($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
@@ -1159,6 +1161,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array
(
@@ -1169,12 +1172,12 @@
'sort' => $order[0]['dir'],
'filter' => $this->filter,
'cat_id' => $this->cat_id,
- 'allrows' => phpgw::get_var('length', 'int') ==
-1
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export
);
$values =
$this->bo->read_activities_pr_agreement_group($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
@@ -1356,6 +1359,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array
(
@@ -1366,7 +1370,7 @@
'sort' => $order[0]['dir'],
'filter' => $this->filter,
'cat_id' => $this->cat_id,
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'activity_id' => $activity_id
);
@@ -1384,7 +1388,7 @@
);
}
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $content;
}
Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php 2016-05-08 13:03:04 UTC (rev
14986)
+++ trunk/property/inc/class.uiproject.inc.php 2016-05-09 13:02:55 UTC (rev
14987)
@@ -647,6 +647,7 @@
$start_date = urldecode(phpgw::get_var('start_date'));
$end_date = urldecode(phpgw::get_var('end_date'));
$skip_origin = phpgw::get_var('skip_origin', 'bool');
+ $export = phpgw::get_var('export', 'bool');
if ($start_date && empty($end_date))
{
@@ -660,7 +661,7 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'start_date' => $start_date,
'end_date' => $end_date,
'skip_origin' => $skip_origin
@@ -668,7 +669,7 @@
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uirequest.inc.php
===================================================================
--- trunk/property/inc/class.uirequest.inc.php 2016-05-08 13:03:04 UTC (rev
14986)
+++ trunk/property/inc/class.uirequest.inc.php 2016-05-09 13:02:55 UTC (rev
14987)
@@ -128,6 +128,7 @@
$start_date = urldecode(phpgw::get_var('start_date'));
$end_date = urldecode(phpgw::get_var('end_date'));
$list_descr = phpgw::get_var('list_descr', 'bool');
+ $export = phpgw::get_var('export', 'bool');
$query = phpgw::get_var('query');
if (!empty($query))
@@ -148,7 +149,7 @@
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
'dir' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'project_id' => $project_id,
'start_date' => $start_date,
'end_date' => $end_date,
@@ -156,7 +157,7 @@
);
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uiresponsible.inc.php
===================================================================
--- trunk/property/inc/class.uiresponsible.inc.php 2016-05-08 13:03:04 UTC
(rev 14986)
+++ trunk/property/inc/class.uiresponsible.inc.php 2016-05-09 13:02:55 UTC
(rev 14987)
@@ -448,6 +448,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
@@ -455,7 +456,7 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'appname' => $this->appname,
'location' => $this->location
);
@@ -465,7 +466,7 @@
$values = $this->bo->read_type($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uis_agreement.inc.php
===================================================================
--- trunk/property/inc/class.uis_agreement.inc.php 2016-05-08 13:03:04 UTC
(rev 14986)
+++ trunk/property/inc/class.uis_agreement.inc.php 2016-05-09 13:02:55 UTC
(rev 14987)
@@ -424,6 +424,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
@@ -431,7 +432,7 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'filter' => $this->filter,
'cat_id' => $this->cat_id,
'member_id' => $this->member_id,
@@ -446,7 +447,7 @@
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uitemplate.inc.php
===================================================================
--- trunk/property/inc/class.uitemplate.inc.php 2016-05-08 13:03:04 UTC (rev
14986)
+++ trunk/property/inc/class.uitemplate.inc.php 2016-05-09 13:02:55 UTC (rev
14987)
@@ -328,6 +328,7 @@
$search = phpgw::get_var('search');
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'filter' => $this->filter,
@@ -342,7 +343,7 @@
//'dir' => phpgw::get_var('dir'),
'chapter_id' => $this->chapter_id,
//'cat_id' => phpgw::get_var('cat_id', 'int',
'REQUEST', 0),
- 'allrows' => phpgw::get_var('length', 'int') ==
-1
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
);
$result_objects = array();
@@ -350,7 +351,7 @@
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
@@ -368,6 +369,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'start' => $this->start,
@@ -375,7 +377,7 @@
'query' => $search['value'],
'sort' => $order[0]['dir'],
'order' =>
$columns[$order[0]['column']]['data'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'chapter_id' => $this->chapter_id,
'template_id' => $template_id
);
@@ -429,7 +431,7 @@
}
//
// echo '<pre>'; print_r($content); echo '</pre>';exit('hour');
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $content;
}
Modified: trunk/property/inc/class.uitenant_claim.inc.php
===================================================================
--- trunk/property/inc/class.uitenant_claim.inc.php 2016-05-08 13:03:04 UTC
(rev 14986)
+++ trunk/property/inc/class.uitenant_claim.inc.php 2016-05-09 13:02:55 UTC
(rev 14987)
@@ -382,6 +382,7 @@
$district_id = phpgw::get_var('district_id', 'int');
$columns = phpgw::get_var('columns');
$project_id = isset($data['project_id']) &&
$data['project_id'] ? $data['project_id'] : phpgw::get_var('project_id');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'start' => $this->start,
@@ -392,7 +393,7 @@
'user_id' => $this->user_id,
'status' => $this->status,
'cat_id' => $this->cat_id,
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'project_id' => $project_id,
'district_id' => $district_id
);
@@ -401,7 +402,7 @@
$result_count = 0;
//
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php 2016-05-08 13:03:04 UTC (rev
14986)
+++ trunk/property/inc/class.uitts.inc.php 2016-05-09 13:02:55 UTC (rev
14987)
@@ -126,6 +126,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
@@ -135,7 +136,7 @@
'sort' => $order[0]['dir'],
'dir' => $order[0]['dir'],
'cat_id' => phpgw::get_var('cat_id', 'int',
'REQUEST', 0),
- 'allrows' => phpgw::get_var('length', 'int') ==
-1 ? true : false,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'status_id' => $this->bo->status_id,
'user_id' => $this->bo->user_id,
'reported_by' => $this->bo->reported_by,
@@ -177,7 +178,7 @@
}
}
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php 2016-05-08 13:03:04 UTC
(rev 14986)
+++ trunk/property/inc/class.uiworkorder.inc.php 2016-05-09 13:02:55 UTC
(rev 14987)
@@ -114,34 +114,11 @@
$this->decimal_separator = ',';
}
- function save_sessiondata()
- {
- $data = array
- (
- 'start' => $this->start,
- 'query' => $this->query,
- 'sort' => $this->sort,
- 'order' => $this->order,
- 'filter' => $this->filter,
- 'cat_id' => $this->cat_id,
- 'status_id' => $this->status_id,
- 'wo_hour_cat_id' => $this->wo_hour_cat_id,
- 'start_date' => $this->start_date,
- 'end_date' => $this->end_date,
- 'b_group' => $this->b_group,
- 'paid' => $this->paid,
- 'b_account' => $this->b_account,
- 'district_id' => $this->district_id,
- 'criteria_id' => $this->criteria_id
- );
- $this->bo->save_sessiondata($data);
- }
-
function download()
{
if (!$this->acl_read)
{
- $this->bocommon->no_access();
+ phpgw::no_access();
return;
}
@@ -348,6 +325,7 @@
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int');
$columns = phpgw::get_var('columns');
+ $export = phpgw::get_var('export', 'bool');
$params = array
(
@@ -356,13 +334,13 @@
'query' => $search['value'],
'order' =>
$columns[$order[0]['column']]['data'],
'sort' => $order[0]['dir'],
- 'allrows' => phpgw::get_var('length', 'int') ==
-1,
+ 'allrows' => phpgw::get_var('length', 'int') ==
-1 || $export,
'start_date' => $start_date,
'end_date' => $end_date
);
$values = $this->bo->read($params);
- if (phpgw::get_var('export', 'bool'))
+ if ($export)
{
return $values;
}
@@ -397,8 +375,6 @@
$start_date = urldecode($this->start_date);
$end_date = urldecode($this->end_date);
- $this->save_sessiondata();
-
if (phpgw::get_var('phpgw_return_as') == 'json')
{
return $this->query();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14987] set allrows on download,
sigurdne <=