Skip to content

Commit

Permalink
Fix for RDS collections search (FuseCP#100)
Browse files Browse the repository at this point in the history
  • Loading branch information
IvanSchulz committed Jul 26, 2022
1 parent f784acb commit 6c34408
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
9 changes: 1 addition & 8 deletions SolidCP/Database/update_db.sql
Original file line number Diff line number Diff line change
Expand Up @@ -6710,7 +6710,7 @@ WHERE
or (@ItemID is not Null AND S.ItemID = @ItemID))'

IF @FilterColumn <> '' AND @FilterValue <> ''
SET @sql = @sql + ' AND ' + @FilterColumn + ' LIKE @FilterValue '
SET @sql = @sql + ' AND ' + @FilterColumn + ' LIKE ''%' + @FilterValue + '%'' '

IF @SortColumn <> '' AND @SortColumn IS NOT NULL
SET @sql = @sql + ' ORDER BY ' + @SortColumn + ' '
Expand Down Expand Up @@ -23378,10 +23378,3 @@ BEGIN
INSERT [dbo].[Themes] ([ThemeID], [DisplayName], [LTRName], [RTLName], [Enabled], [DisplayOrder]) VALUES (2, N'SolidCP', N'SolidCP', N'SolidCP', 1, 9)
END
GO

-- SimpleDNS 9.x
IF NOT EXISTS (SELECT * FROM [dbo].[Providers] WHERE [ProviderID] = '1901' AND DisplayName = 'SimpleDNS Plus 9.x')
BEGIN
INSERT [dbo].[Providers] ([ProviderID], [GroupID], [ProviderName], [DisplayName], [ProviderType], [EditorControl], [DisableAutoDiscovery]) VALUES (1903, 7, N'SimpleDNS', N'SimpleDNS Plus 9.x', N'SolidCP.Providers.DNS.SimpleDNS9, SolidCP.Providers.DNS.SimpleDNS90', N'SimpleDNS', NULL)
END
GO
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public int GetRDSCollectonsPagedCount(int itemId, string filterValue)

public RdsCollection[] GetRDSCollectonsPaged(int itemId, int maximumRows, int startRowIndex, string sortColumn, string filterValue)
{
rdsCollections = ES.Services.RDS.GetRdsCollectionsPaged(itemId, "Name", filterValue, sortColumn, startRowIndex, maximumRows);
rdsCollections = ES.Services.RDS.GetRdsCollectionsPaged(itemId, "DisplayName", filterValue, sortColumn, startRowIndex, maximumRows);

return rdsCollections.Collections;

Expand Down

0 comments on commit 6c34408

Please sign in to comment.