From b7f3f8408037bbb85ee1f8b33aec40ea6da82fd1 Mon Sep 17 00:00:00 2001
From: Tomasz Sowa <t.sowa@ttmath.org>
Date: Mon, 8 Jul 2013 14:42:14 +0000
Subject: [PATCH] changed: in 'showtickets' winix function          now tickets
 are sorted by the sort_index and then by date changed: html in 'sort' winix
 function (added items' subjects to the item lists)

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@931 e52654a7-88a9-db11-a3e9-0013d4bc506e
---
 html/fun_sort.html             | 2 +-
 locale/en                      | 2 +-
 locale/pl                      | 1 +
 plugins/ticket/showtickets.cpp | 9 +++++++--
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/html/fun_sort.html b/html/fun_sort.html
index 61edf9b..7c599e9 100755
--- a/html/fun_sort.html
+++ b/html/fun_sort.html
@@ -36,7 +36,7 @@
 			[# is it correct? may give this 'if' only to /-/thumb param? ]
 			[if item_tab_has_thumb]<img src="[item_tab_link]/-/thumb" alt="[item_tab_subject]">[end]
 
-			[item_tab_url]
+			[item_tab_url] [is-no item_tab_subject str ""]<span class="winix_sort_item_title">({sort_item_subject}: [item_tab_subject])</span>[end]
 			</li>
 		[end]
 		</ul>
diff --git a/locale/en b/locale/en
index 310f375..e16b7aa 100755
--- a/locale/en
+++ b/locale/en
@@ -427,7 +427,7 @@ slog_turn_over = Session's log turned over due to size greater than
 sort_header = Sort
 sort_current_sortindex = Current sort index
 sort_info_multi = Set an order of items by using the mouse.
-
+sort_item_subject = Subject:
 
 stat_header = Stat
 stat_item_type = type
diff --git a/locale/pl b/locale/pl
index 11b19b2..a60db50 100755
--- a/locale/pl
+++ b/locale/pl
@@ -448,6 +448,7 @@ slog_turn_over = Log sesji wyczyszczony w związku z przekroczeniem wielkości
 sort_header = Sortuj
 sort_current_sortindex = Bieżący indeks sortowania
 sort_info_multi = Ustaw kolejność elementów przeciągając je przy pomocy myszki.
+sort_item_subject = Tytuł:
 
 stat_header = Stat
 stat_item_type = typ
diff --git a/plugins/ticket/showtickets.cpp b/plugins/ticket/showtickets.cpp
index 8361876..5043703 100755
--- a/plugins/ticket/showtickets.cpp
+++ b/plugins/ticket/showtickets.cpp
@@ -2,7 +2,7 @@
  * This file is a part of Winix
  * and is not publicly distributed
  * 
- * Copyright (c) 2010-2012, Tomasz Sowa
+ * Copyright (c) 2010-2013, Tomasz Sowa
  * All rights reserved.
  * 
  */
@@ -55,7 +55,11 @@ bool ShowTickets::Sort::operator()(const Item * item1, const Item * item2)
 	}
 	else
 	{
-		// sorting by date
+		// sorting by sort_index and if equal then by date
+
+		if( item1->sort_index != item2->sort_index )
+			return item1->sort_index < item2->sort_index;
+
 		return item1->date_creation > item2->date_creation;
 	}
 }
@@ -77,6 +81,7 @@ void ShowTickets::ReadFiles(long dir_id)
 	iq.sel_privileges = true;
 	iq.sel_date       = true;
 	iq.sel_meta       = true;
+	iq.sel_sort_index = true;
 	iq.WhereParentId(dir_id);
 	iq.WhereType(Item::file);
 	iq.WhereFileType(WINIX_ITEM_FILETYPE_NONE);