From a571d42f46aac8d6df4a95f6a928890e4e76e75f Mon Sep 17 00:00:00 2001 From: kolaente Date: Wed, 18 Jun 2025 09:45:11 +0200 Subject: [PATCH] chore: refactor searching for link shares --- pkg/db/fixtures/link_shares.yml | 1 + pkg/models/link_sharing.go | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkg/db/fixtures/link_shares.yml b/pkg/db/fixtures/link_shares.yml index ed48152c3..4bfeb83cf 100644 --- a/pkg/db/fixtures/link_shares.yml +++ b/pkg/db/fixtures/link_shares.yml @@ -24,6 +24,7 @@ updated: 2018-12-02 15:13:12 - id: 4 hash: testWithPassword + name: testWithPassword project_id: 1 right: 0 password: '$2a$04$X4aRMEt0ytgPwMIgv36cI..7X9.nhY/.tYwxpqSi0ykRHx2CwQ0S6' # 12345678 diff --git a/pkg/models/link_sharing.go b/pkg/models/link_sharing.go index c5651487d..9fdda56ad 100644 --- a/pkg/models/link_sharing.go +++ b/pkg/models/link_sharing.go @@ -220,14 +220,14 @@ func (share *LinkSharing) ReadAll(s *xorm.Session, a web.Auth, search string, pa limit, start := getLimitFromPageIndex(page, perPage) var shares []*LinkSharing - query := s. - Where(builder.And( - builder.Eq{"project_id": share.ProjectID}, - builder.Or( - db.ILIKE("hash", search), - db.ILIKE("name", search), - ), - )) + var where []builder.Cond + where = append(where, builder.Eq{"project_id": share.ProjectID}) + + if search != "" { + where = append(where, db.ILIKE("name", search)) + } + + query := s.Where(builder.And(where...)) if limit > 0 { query = query.Limit(limit, start)