Merge chanegs from rdolezel

This commit is contained in:
Virtuworks 2012-08-21 13:25:08 -04:00
commit 6c9fa06033

View file

@ -4803,12 +4803,12 @@ AS
IF (@Name IS NULL) IF (@Name IS NULL)
BEGIN BEGIN
SET @Name = '%' SET @Name = ''%''
END END
IF (@Email IS NULL) IF (@Email IS NULL)
BEGIN BEGIN
SET @Email = '%' SET @Email = ''%''
END END
CREATE TABLE #TempBlackBerryUsers CREATE TABLE #TempBlackBerryUsers
@ -4823,7 +4823,7 @@ CREATE TABLE #TempBlackBerryUsers
) )
IF (@SortColumn = 'DisplayName') IF (@SortColumn = ''DisplayName'')
BEGIN BEGIN
INSERT INTO INSERT INTO
#TempBlackBerryUsers #TempBlackBerryUsers
@ -4871,14 +4871,14 @@ END
DECLARE @RetCount int DECLARE @RetCount int
SELECT @RetCount = COUNT(ID) FROM #TempBlackBerryUsers SELECT @RetCount = COUNT(ID) FROM #TempBlackBerryUsers
IF (@SortDirection = 'ASC') IF (@SortDirection = ''ASC'')
BEGIN BEGIN
SELECT * FROM #TempBlackBerryUsers SELECT * FROM #TempBlackBerryUsers
WHERE ID > @StartRow AND ID <= (@StartRow + @Count) WHERE ID > @StartRow AND ID <= (@StartRow + @Count)
END END
ELSE ELSE
BEGIN BEGIN
IF (@SortColumn = 'DisplayName') IF (@SortColumn = ''DisplayName'')
BEGIN BEGIN
SELECT * FROM #TempBlackBerryUsers SELECT * FROM #TempBlackBerryUsers
WHERE ID >@RetCount - @Count - @StartRow AND ID <= @RetCount- @StartRow ORDER BY DisplayName DESC WHERE ID >@RetCount - @Count - @StartRow AND ID <= @RetCount- @StartRow ORDER BY DisplayName DESC
@ -4892,7 +4892,8 @@ BEGIN
END END
DROP TABLE #TempBlackBerryUsers DROP TABLE #TempBlackBerryUsers'
END
GO GO