Fixed groups autocomplete
Change-Id: I80b9eaaf5ac5918f02557beaffeed42b0011c591 Signed-off-by: smarcet <smarcet@gmail.com>
This commit is contained in:
parent
914972a407
commit
0705f655eb
|
@ -64,6 +64,16 @@ final class GroupApiController extends APICRUDController
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
protected function getOrderRules():array{
|
||||||
|
return [
|
||||||
|
'name',
|
||||||
|
'slug'
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -31,6 +31,7 @@ final class OrderParser
|
||||||
//default ordering is asc
|
//default ordering is asc
|
||||||
foreach($orders as $field)
|
foreach($orders as $field)
|
||||||
{
|
{
|
||||||
|
$field = trim($field);
|
||||||
$element = null;
|
$element = null;
|
||||||
if(strpos($field, '+') === 0)
|
if(strpos($field, '+') === 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -23,6 +23,18 @@ use utils\PagingResponse;
|
||||||
*/
|
*/
|
||||||
final class DoctrineGroupRepository extends ModelDoctrineRepository implements IGroupRepository
|
final class DoctrineGroupRepository extends ModelDoctrineRepository implements IGroupRepository
|
||||||
{
|
{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
protected function getOrderMappings()
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'name' => 'e.name',
|
||||||
|
'slug' => 'e.slug',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -107,6 +107,8 @@ final class ServicesProvider extends ServiceProvider
|
||||||
\Services\SecurityPolicies\BlacklistSecurityPolicy::class,
|
\Services\SecurityPolicies\BlacklistSecurityPolicy::class,
|
||||||
\Services\SecurityPolicies\LockUserSecurityPolicy::class,
|
\Services\SecurityPolicies\LockUserSecurityPolicy::class,
|
||||||
\Services\SecurityPolicies\OAuth2LockClientCounterMeasure::class,
|
\Services\SecurityPolicies\OAuth2LockClientCounterMeasure::class,
|
||||||
|
IUserService::class,
|
||||||
|
IGroupService::class,
|
||||||
OAuth2SecurityPolicy::class,
|
OAuth2SecurityPolicy::class,
|
||||||
AuthorizationCodeRedeemPolicy::class,
|
AuthorizationCodeRedeemPolicy::class,
|
||||||
UtilsServiceCatalog::CheckPointService,
|
UtilsServiceCatalog::CheckPointService,
|
||||||
|
|
|
@ -29,7 +29,7 @@ $(document).ready(function() {
|
||||||
url: urls.fetchGroups,
|
url: urls.fetchGroups,
|
||||||
wildcard: '%QUERY%',
|
wildcard: '%QUERY%',
|
||||||
prepare: function (query, settings) {
|
prepare: function (query, settings) {
|
||||||
settings.url = urls.fetchGroups+'?page=1&per_page=10&filter[]=name=@'+query+',slug=@'+query+'&filter[]=active==1';
|
settings.url = urls.fetchGroups+'?page=1&per_page=10&filter[]=name=@'+query+',slug=@'+query+'&filter[]=active==1&order=name,slug';
|
||||||
return settings;
|
return settings;
|
||||||
},
|
},
|
||||||
transform: function(input){
|
transform: function(input){
|
||||||
|
@ -64,7 +64,7 @@ $(document).ready(function() {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
source: groups,
|
source: groups,
|
||||||
limit: 10
|
limit: 20
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue