From dc774dcb7f27806f0ff17c49fd6ff6f361e11898 Mon Sep 17 00:00:00 2001 From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com> Date: Sun, 13 Jun 2010 21:25:36 +0000 Subject: [PATCH] Slight fixes in BoardAsThread --- Common/dataobjects/Board.cs | 30 ++++++++++++------- .../handlers/response/BoardAsThread.cs | 10 ++++++- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/Common/dataobjects/Board.cs b/Common/dataobjects/Board.cs index dc27f06..c76955f 100644 --- a/Common/dataobjects/Board.cs +++ b/Common/dataobjects/Board.cs @@ -191,7 +191,7 @@ namespace FLocal.Common.dataobjects { return result; } - public IEnumerable getThreads(Diapasone diapasone, UserContext context) { + public IEnumerable getThreads(Diapasone diapasone, UserContext context, SortSpec[] sortBy) { return Thread.LoadByIds( from stringId in Config.instance.mainConnection.LoadIdsByConditions( Thread.TableSpec.instance, @@ -202,19 +202,27 @@ namespace FLocal.Common.dataobjects { ), diapasone, new JoinSpec[0], - new SortSpec[] { - new SortSpec( - Thread.TableSpec.instance.getColumnSpec(Thread.TableSpec.FIELD_ISANNOUNCEMENT), - false - ), - new SortSpec( - Thread.TableSpec.instance.getColumnSpec(Thread.TableSpec.FIELD_LASTPOSTDATE), - true - ), - } + sortBy ) select int.Parse(stringId) ); } + public IEnumerable getThreads(Diapasone diapasone, UserContext context) { + return this.getThreads( + diapasone, + context, + new SortSpec[] { + new SortSpec( + Thread.TableSpec.instance.getColumnSpec(Thread.TableSpec.FIELD_ISANNOUNCEMENT), + false + ), + new SortSpec( + Thread.TableSpec.instance.getColumnSpec(Thread.TableSpec.FIELD_LASTPOSTID), + true + ), + } + ); + } + } } diff --git a/IISMainHandler/handlers/response/BoardAsThread.cs b/IISMainHandler/handlers/response/BoardAsThread.cs index eb04dac..bfcea38 100644 --- a/IISMainHandler/handlers/response/BoardAsThread.cs +++ b/IISMainHandler/handlers/response/BoardAsThread.cs @@ -21,7 +21,15 @@ namespace FLocal.IISHandler.handlers { override protected XElement[] getSpecificData(WebContext context) { Board board = Board.LoadById(int.Parse(context.requestParts[1])); PageOuter pageOuter = PageOuter.createFromGet(context.requestParts, context.userSettings.postsPerPage); - IEnumerable threads = board.getThreads(pageOuter, context); + IEnumerable threads = board.getThreads( + pageOuter, + context, new SortSpec[] { + new SortSpec( + Thread.TableSpec.instance.getColumnSpec(Thread.TableSpec.FIELD_ID), + false + ), + } + ); return new XElement[] { new XElement("currentLocation", board.exportToXmlSimpleWithParent(context)), new XElement("boards", from subBoard in board.subBoards select subBoard.exportToXml(context, true)),