From 40d35ff9f7b9c3522112960bf7d5c15c29213ffd Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 16 Oct 2010 10:43:24 -0600
Subject: [PATCH] /browse: Make the sort cookies session cookies and remove
 formats and sort from list of sortable fields

---
 resources/content_server/browse/browse.js | 2 +-
 src/calibre/library/server/browse.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/content_server/browse/browse.js b/resources/content_server/browse/browse.js
index 5505c5bccc..99755f5f99 100644
--- a/resources/content_server/browse/browse.js
+++ b/resources/content_server/browse/browse.js
@@ -55,7 +55,7 @@ function init_sort_combobox() {
        selectedList: 1,
        click: function(event, ui){
             $(this).multiselect("close");
-            cookie(sort_cookie_name, ui.value, {expires: 365});
+            cookie(sort_cookie_name, ui.value);
             window.location.reload();
        }
     });
diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py
index 9d483d1b4e..c45a47932d 100644
--- a/src/calibre/library/server/browse.py
+++ b/src/calibre/library/server/browse.py
@@ -221,7 +221,7 @@ class BrowseServer(object):
             sort_opts, added = [], set([])
             displayed_custom_fields = custom_fields_to_display(self.db)
             for x in fm.sortable_field_keys():
-                if x == 'ondevice':
+                if x in ('ondevice', 'formats', 'sort'):
                     continue
                 if fm[x]['is_custom'] and x not in displayed_custom_fields:
                     continue