openinfra
/
openstackid
Code Issues Proposed changes

Fixed groups autocomplete 

Change-Id: I80b9eaaf5ac5918f02557beaffeed42b0011c591
Signed-off-by: smarcet <smarcet@gmail.com>
This commit is contained in:
smarcet 2020-11-16 15:28:59 -03:00
parent 914972a407
commit 0705f655eb
5 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Api/GroupApiController.php
View File

@ -64,6 +64,16 @@ final class GroupApiController extends APICRUDController
];
}
/**
* @return array
*/
protected function getOrderRules():array{
return [
'name',
'slug'
];
}
/**
* @return array
*/

1
app/Http/Utils/OrderParser.php
View File

@ -31,6 +31,7 @@ final class OrderParser
//default ordering is asc
foreach($orders as $field)
{
$field = trim($field);
$element = null;
if(strpos($field, '+') === 0)
{

12
app/Repositories/DoctrineGroupRepository.php
View File

@ -23,6 +23,18 @@ use utils\PagingResponse;
*/
final class DoctrineGroupRepository extends ModelDoctrineRepository implements IGroupRepository
{
/**
* @return array
*/
protected function getOrderMappings()
{
return [
'name' => 'e.name',
'slug' => 'e.slug',
];
}
/**
* @return array
*/

2
app/Services/ServicesProvider.php
View File

@ -107,6 +107,8 @@ final class ServicesProvider extends ServiceProvider
\Services\SecurityPolicies\BlacklistSecurityPolicy::class,
\Services\SecurityPolicies\LockUserSecurityPolicy::class,
\Services\SecurityPolicies\OAuth2LockClientCounterMeasure::class,
IUserService::class,
IGroupService::class,
OAuth2SecurityPolicy::class,
AuthorizationCodeRedeemPolicy::class,
UtilsServiceCatalog::CheckPointService,

4
public/assets/js/admin/edit-user.js
View File

@ -29,7 +29,7 @@ $(document).ready(function() {
url: urls.fetchGroups,
wildcard: '%QUERY%',
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;
},
transform: function(input){
@ -64,7 +64,7 @@ $(document).ready(function() {
}
},
source: groups,
limit: 10
limit: 20
}
]
});