[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15799] Syncromind: merge 15796:15798 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [15799] Syncromind: merge 15796:15798 from trunk |
|
Date: |
Tue, 4 Oct 2016 17:56:12 +0000 (UTC) |
Revision: 15799
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15799
Author: sigurdne
Date: 2016-10-04 17:56:12 +0000 (Tue, 04 Oct 2016)
Log Message:
-----------
Syncromind: merge 15796:15798 from trunk
Modified Paths:
--------------
branches/dev-syncromind-2/preferences/index.php
branches/dev-syncromind-2/preferences/setup/setup.inc.php
branches/dev-syncromind-2/preferences/setup/tables_update.inc.php
branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php
branches/dev-syncromind-2/rental/inc/class.uicontract.inc.php
Property Changed:
----------------
branches/dev-syncromind-2/
Property changes on: branches/dev-syncromind-2
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14934-14935,15165-15215,15218-15220,15222-15304,15306-15337,15339,15341-15398,15400-15421,15423-15474,15476-15607,15609,15611,15613-15652,15654-15732,15734,15736-15746,15750-15770,15772-15775,15777-15795
+ /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14934-14935,15165-15215,15218-15220,15222-15304,15306-15337,15339,15341-15398,15400-15421,15423-15474,15476-15607,15609,15611,15613-15652,15654-15732,15734,15736-15746,15750-15770,15772-15775,15777-15795,15797-15798
Modified: branches/dev-syncromind-2/preferences/index.php
===================================================================
--- branches/dev-syncromind-2/preferences/index.php 2016-10-04 17:51:45 UTC
(rev 15798)
+++ branches/dev-syncromind-2/preferences/index.php 2016-10-04 17:56:12 UTC
(rev 15799)
@@ -158,5 +158,4 @@
}
$GLOBALS['phpgw']->template->pfp('out', 'list');
- $GLOBALS['phpgw']->common->phpgw_footer();
-?>
+ $GLOBALS['phpgw']->common->phpgw_footer();
\ No newline at end of file
Modified: branches/dev-syncromind-2/preferences/setup/setup.inc.php
===================================================================
--- branches/dev-syncromind-2/preferences/setup/setup.inc.php 2016-10-04
17:51:45 UTC (rev 15798)
+++ branches/dev-syncromind-2/preferences/setup/setup.inc.php 2016-10-04
17:56:12 UTC (rev 15799)
@@ -2,7 +2,7 @@
/**
* Preferences - user manual
*
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @copyright Copyright (C) 2000-2016 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package preferences
* @subpackage setup
@@ -11,10 +11,10 @@
$setup_info['preferences']['name'] = 'preferences';
$setup_info['preferences']['title'] = 'Preferences';
- $setup_info['preferences']['version'] = '0.9.17.500';
+ $setup_info['preferences']['version'] = '0.9.17.501';
$setup_info['preferences']['app_order'] = 1;
$setup_info['preferences']['tables'] = '';
- $setup_info['preferences']['enable'] = 2;
+ $setup_info['preferences']['enable'] = 1;
$setup_info['preferences']['app_group'] = 'systools';
// The hooks this app includes, needed for hooks registration
@@ -29,4 +29,3 @@
'appname' => 'phpgwapi',
'versions' => array('0.9.17', '0.9.18')
);
-?>
Modified: branches/dev-syncromind-2/preferences/setup/tables_update.inc.php
===================================================================
--- branches/dev-syncromind-2/preferences/setup/tables_update.inc.php
2016-10-04 17:51:45 UTC (rev 15798)
+++ branches/dev-syncromind-2/preferences/setup/tables_update.inc.php
2016-10-04 17:56:12 UTC (rev 15799)
@@ -1,7 +1,7 @@
<?php
/**
* Setup
- * @copyright Copyright (C) 2003-2005 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @copyright Copyright (C) 2003-2016 Free Software Foundation, Inc.
http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package preferences
* @subpackage setup
@@ -15,4 +15,11 @@
$GLOBALS['setup_info']['preferences']['currentver'] =
'0.9.17.500';
return $GLOBALS['setup_info']['preferences']['currentver'];
}
-?>
+
+ $test[] = '0.9.17.500';
+ function preferences_upgrade0_9_17_500()
+ {
+ $GLOBALS['phpgw_setup']->oProc->query("UPDATE
phpgw_applications SET app_enabled = 1 WHERE app_name = 'preferences'");
+ $GLOBALS['setup_info']['preferences']['currentver'] =
'0.9.17.501';
+ return $GLOBALS['setup_info']['preferences']['currentver'];
+ }
\ No newline at end of file
Modified: branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php
2016-10-04 17:51:45 UTC (rev 15798)
+++ branches/dev-syncromind-2/rental/inc/class.uicomposite.inc.php
2016-10-04 17:56:12 UTC (rev 15799)
@@ -130,22 +130,17 @@
public function query()
{
- if
($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
- {
- $user_rows_per_page =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
- }
- else
- {
- $user_rows_per_page = 10;
- }
+ $length = phpgw::get_var('length', 'int');
+ $user_rows_per_page = $length > 0 ? $length :
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
+
$search = phpgw::get_var('search');
$order = phpgw::get_var('order');
$draw = phpgw::get_var('draw', 'int', 'REQUEST', 1);
$columns = phpgw::get_var('columns');
$start_index = phpgw::get_var('start', 'int',
'REQUEST', 0);
- $num_of_objects = (phpgw::get_var('length', 'int') <=
0) ? $user_rows_per_page : phpgw::get_var('length', 'int');
+ $num_of_objects = $length == -1 ? 0 :
$user_rows_per_page;
$sort_field = ($columns[$order[0]['column']]['data']) ?
$columns[$order[0]['column']]['data'] : 'id';
$sort_ascending = ($order[0]['dir'] == 'desc') ? false
: true;
$search_for = (is_array($search)) ? $search['value'] :
$search;
@@ -167,7 +162,7 @@
if ($export)
{
- $num_of_objects = null;
+ $num_of_objects = 0;
}
//Retrieve the type of query and perform type specific
logic
@@ -294,6 +289,16 @@
} */
if ($export)
{
+ /*
+ * reverse of nl2br()
+ */
+ foreach ($rows as &$row)
+ {
+ foreach ($row as $key => &$value)
+ {
+ $value =
preg_replace('#<br\s*?/?>#i', "\n", $value);
+ }
+ }
return $rows;
}
Modified: branches/dev-syncromind-2/rental/inc/class.uicontract.inc.php
===================================================================
--- branches/dev-syncromind-2/rental/inc/class.uicontract.inc.php
2016-10-04 17:51:45 UTC (rev 15798)
+++ branches/dev-syncromind-2/rental/inc/class.uicontract.inc.php
2016-10-04 17:56:12 UTC (rev 15799)
@@ -844,7 +844,7 @@
$columns = phpgw::get_var('columns');
$start_index = phpgw::get_var('start', 'int',
'REQUEST', 0);
- $num_of_objects = $length == -1 ? null :
$user_rows_per_page;
+ $num_of_objects = $length == -1 ? 0 :
$user_rows_per_page;
$sort_field = ($columns[$order[0]['column']]['data']) ?
$columns[$order[0]['column']]['data'] : 'old_contract_id';
$sort_ascending = ($order[0]['dir'] == 'desc') ? false
: true;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15799] Syncromind: merge 15796:15798 from trunk,
sigurdne <=