diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py index cb5ad6f2..2a02aedf 100644 --- a/pyfpdb/Filters.py +++ b/pyfpdb/Filters.py @@ -453,15 +453,6 @@ class Filters(threading.Thread): hbox.pack_start(lbl_to, expand=False, padding=3) hbox.pack_start(sb2, False, False, 0) - if "SeatSep" in display and display["SeatSep"] == True: - hbox = gtk.HBox(False, 0) - vbox1.pack_start(hbox, False, True, 0) - cb = gtk.CheckButton(self.filterText['seatsshow']) - cb.connect('clicked', self.__set_seat_select, 'show') - hbox.pack_start(cb, False, False, 0) - self.sbSeats['show'] = cb - self.seats['show'] = False - self.sbSeats['from'] = sb1 self.sbSeats['to'] = sb2 @@ -492,6 +483,15 @@ class Filters(threading.Thread): self.sbGroups['posn'] = cb self.groups['posn'] = False + if "SeatSep" in display and display["SeatSep"] == True: + hbox = gtk.HBox(False, 0) + vbox1.pack_start(hbox, False, True, 0) + cb = gtk.CheckButton(self.filterText['seatsshow']) + cb.connect('clicked', self.__set_seat_select, 'show') + hbox.pack_start(cb, False, False, 0) + self.sbSeats['show'] = cb + self.seats['show'] = False + def fillCardsFrame(self, vbox): hbox1 = gtk.HBox(True,0) hbox1.show() diff --git a/pyfpdb/SQL.py b/pyfpdb/SQL.py index 51ae1a1e..9279126e 100644 --- a/pyfpdb/SQL.py +++ b/pyfpdb/SQL.py @@ -1721,8 +1721,8 @@ class Sql: self.query['getGames'] = """SELECT DISTINCT category from Gametypes""" self.query['getLimits'] = """SELECT DISTINCT bigBlind from Gametypes ORDER by bigBlind DESC""" self.query['getLimits2'] = """SELECT DISTINCT limitType, bigBlind - from Gametypes - ORDER by bigBlind DESC""" + from Gametypes + ORDER by limitType DESC, bigBlind DESC""" if db_server == 'mysql': self.query['playerDetailedStats'] = """ @@ -1800,8 +1800,8 @@ class Sql: else concat('Z', ) end + ,upper(gt.limitType) desc ,maxbigblind desc - ,upper(gt.limitType) ,s.name """ elif db_server == 'postgresql': @@ -1881,8 +1881,8 @@ class Sql: else 'Z'|| end + ,upper(gt.limitType) desc ,maxbigblind desc - ,upper(gt.limitType) ,s.name """ elif db_server == 'sqlite': @@ -1962,8 +1962,8 @@ class Sql: else 'Z'|| end + ,upper(gt.limitType) desc ,maxbigblind desc - ,upper(gt.limitType) ,s.name """