* [refac] Compatible moreLinks config.
This commit is contained in:
@@ -146,6 +146,10 @@ class picker extends wg
|
||||
unset($pickerProps['class']);
|
||||
}
|
||||
|
||||
global $config;
|
||||
$name = isset($pickerProps['name']) ? $pickerProps['name'] : '';
|
||||
if(isset($config->moreLinks[$name])) $pickerItems = $config->moreLinks[$name];
|
||||
|
||||
$pickerProps['_props'] = $restProps;
|
||||
$pickerProps['items'] = $pickerItems;
|
||||
$pickerProps['defaultValue'] = $defaultValue;
|
||||
|
||||
+11
-3
@@ -1186,18 +1186,26 @@ class user extends control
|
||||
{
|
||||
$params = base64_decode($this->get->params);
|
||||
parse_str($params, $parsedParams);
|
||||
$users = $this->user->getPairs(zget($parsedParams, 'params', ''), zget($parsedParams, 'usersToAppended', ''));
|
||||
|
||||
$usersToAppended = zget($parsedParams, 'usersToAppended', '');
|
||||
$users = $this->user->getPairs(zget($parsedParams, 'params', ''));
|
||||
|
||||
$search = $this->get->search;
|
||||
$limit = $this->get->limit;
|
||||
$limit = $this->config->maxCount;
|
||||
$index = 0;
|
||||
$newUsers = array();
|
||||
foreach($users as $account => $realname)
|
||||
{
|
||||
if($index >= $limit) break;
|
||||
if($search && stripos($account, $search) === false and stripos($realname, $search) === false) continue;
|
||||
if(empty($search) && $usersToAppended && strpos(",{$usersToAppended},", ",{$account},") !== false)
|
||||
{
|
||||
$newUsers[] = array('value' => $account, 'text' => $realname);
|
||||
continue;
|
||||
}
|
||||
|
||||
$index ++;
|
||||
$newUsers[$account] = $realname;
|
||||
$newUsers[] = array('value' => $account, 'text' => $realname);
|
||||
}
|
||||
|
||||
echo json_encode($newUsers);
|
||||
|
||||
@@ -305,7 +305,7 @@ class userModel extends model
|
||||
$moreLinkParams = "params={$params}&usersToAppended={$usersToAppended}";
|
||||
|
||||
$moreLink = helper::createLink('user', 'ajaxGetMore');
|
||||
$this->config->user->moreLink = $moreLink . (strpos($moreLink, '?') === false ? '?' : '&') . "params=" . base64_encode($moreLinkParams);
|
||||
$this->config->user->moreLink = $moreLink . (strpos($moreLink, '?') === false ? '?' : '&') . "params=" . base64_encode($moreLinkParams) . '&search={search}';
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user