openinfra
/
openstackid
Code Issues Proposed changes

Fix on User Search (ADMIN) 

Change-Id: I0418b60a52b4b1f4263512a30399642ae927693e
Signed-off-by: smarcet <smarcet@gmail.com>
This commit is contained in:
smarcet 2020-07-07 18:20:56 -03:00
parent 68c10a2765
commit 0f1397f4ab
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,6 +199,7 @@ final class GroupApiController extends APICRUDController
'first_name' => ['=@', '=='],
'last_name' => ['=@', '=='],
'email' => ['=@', '=='],
'full_name' => ['=@', '=='],
]);
}
@ -208,6 +209,7 @@ final class GroupApiController extends APICRUDController
'first_name' => 'nullable|string',
'last_name' => 'nullable|string',
'email' => 'nullable|string',
'full_name' => 'nullable|string',
];
if(count($filter_validator_rules)) {

2
app/Http/Controllers/Api/UserApiController.php
View File

@ -61,6 +61,7 @@ final class UserApiController extends APICRUDController {
return [
'first_name' => ['=@', '=='],
'last_name' => ['=@', '=='],
'full_name' => ['=@', '=='],
'email' => ['=@', '=='],
];
}
@ -73,6 +74,7 @@ final class UserApiController extends APICRUDController {
return [
'first_name' => 'nullable|string',
'last_name' => 'nullable|string',
'full_name' => 'nullable|string',
'email' => 'nullable|string',
];
}

2
app/Repositories/DoctrineUserRepository.php
View File

@ -13,6 +13,7 @@
**/
use Auth\Repositories\IUserRepository;
use Auth\User;
use utils\DoctrineFilterMapping;
use utils\DoctrineJoinFilterMapping;
use utils\DoctrineLeftJoinFilterMapping;
@ -31,6 +32,7 @@ final class DoctrineUserRepository extends ModelDoctrineRepository implements IU
return [
'first_name' => 'e.first_name:json_string',
'last_name' => 'e.last_name:json_string',
'full_name' => new DoctrineFilterMapping("concat(e.first_name, ' ', e.last_name) :operator :value"),
'github_user' => 'e.github_user:json_string',
'email' => ['e.email:json_string', 'e.second_email:json_string', 'e.third_email:json_string'],
'active' => 'e.active:json_boolean',

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

@ -39,7 +39,7 @@ GroupMembersCrud.prototype.constructor = GroupMembersCrud;
GroupMembersCrud.prototype._buildFilters = function () {
var term = encodeURIComponent(this.searchTerm);
return 'filter=first_name=@'+term+',last_name=@'+term+',email=@'+term;
return 'filter=first_name=@'+term+',last_name=@'+term+',email=@'+term+',full_name=@'+term;
};
GroupMembersCrud.prototype.init = function () {
@ -54,7 +54,7 @@ GroupMembersCrud.prototype.init = function () {
url: urls.fetchUsers,
wildcard: '%QUERY%',
prepare: function (query, settings) {
settings.url = urls.fetchUsers+'?filter=first_name=@'+query+',last_name=@'+query+',email=@'+query;
settings.url = urls.fetchUsers+'?filter=first_name=@'+query+',last_name=@'+query+',email=@'+query+',full_name=@'+query;
return settings;
},
transform: function(input){

2
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+'?filter[]=name=@'+query+'&filter[]=active==1';
settings.url = urls.fetchGroups+'?page=1&per_page=10&filter[]=name=@'+query+',slug=@'+query+'&filter[]=active==1';
return settings;
},
transform: function(input){