/*
+--------------------------------------------------------------------+
-| CiviCRM version 4.4 |
+| CiviCRM version 4.5 |
+--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2013 |
+| Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
$fnName = function_exists($fnName) ? $fnName : '_civicrm_api3_generic_getlist_output';
$values = $fnName($result, $request);
- $last = $request['params']['limit'] - 1;
- $output = array(
+ $output = array('page_num' => $request['page_num']);
+
+ // Limit is set for searching but not fetching by id
+ if (!empty($request['params']['options']['limit'])) {
// If we have an extra result then this is not the last page
- 'more_results' => isset($values[$last]),
- 'page_num' => $request['page_num'],
- );
- unset($values[$last]);
+ $last = $request['params']['options']['limit'] - 1;
+ $output['more_results'] = isset($values[$last]);
+ unset($values[$last]);
+ }
return civicrm_api3_create_success($values, $request['params'], $entity, 'getlist', CRM_Core_DAO::$_nullObject, $output);
}
}
// When looking up a field e.g. displaying existing record
if (!empty($request['id'])) {
- if (is_string($request['id']) && strpos(',', $request['id'])) {
- $request['id'] = explode(',', $request['id']);
+ if (is_string($request['id']) && strpos($request['id'], ',')) {
+ $request['id'] = explode(',', trim($request['id'], ', '));
}
+ // Don't run into search limits when prefilling selection
+ unset($params['options']['limit'], $params['options']['offset'], $request['params']['options']['limit'], $request['params']['options']['offset']);
$params[$request['id_field']] = is_array($request['id']) ? array('IN' => $request['id']) : $request['id'];
}
$request['params'] += $params;