TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 19:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: sort admin orgs by name (#1536)

Browse Source 
* fix: sort admin orgs by name

* handle nil pointer in webauthn methods

* rename
This commit is contained in:
Livio Amstutz
2021-04-07 09:56:45 +02:00
committed by GitHub
parent e4fe097ec4
commit f9286574a9
5 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/org/repository/view/model/org_query.go
View File

@@ -57,6 +57,8 @@ func (key OrgSearchKey) ToColumnName() string {
return OrgKeyOrgID
case usr_model.OrgSearchKeyOrgName:
return OrgKeyOrgName
case usr_model.OrgSearchKeyOrgNameIgnoreCase:
return "LOWER(" + OrgKeyOrgName + ")" //used for lowercase search
case usr_model.OrgSearchKeyResourceOwner:
return OrgKeyResourceOwner
case usr_model.OrgSearchKeyState:

2
internal/org/repository/view/org_view.go
View File

@@ -31,7 +31,7 @@ func OrgByPrimaryDomain(db *gorm.DB, table, primaryDomain string) (*model.OrgVie
func SearchOrgs(db *gorm.DB, table string, req *org_model.OrgSearchRequest) ([]*model.OrgView, uint64, error) {
orgs := make([]*model.OrgView, 0)
query := repository.PrepareSearchQuery(table, model.OrgSearchRequest{Limit: req.Limit, Offset: req.Offset, Queries: req.Queries, SortingColumn: req.SortingColumn})
query := repository.PrepareSearchQuery(table, model.OrgSearchRequest{Limit: req.Limit, Offset: req.Offset, Queries: req.Queries, SortingColumn: req.SortingColumn, Asc: req.Asc})
count, err := query(db, &orgs)
if err != nil {
return nil, 0, err