Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2011-03-18 17:14:25 +00:00
commit a823f6a473
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/calibre/gui2/tag_view.py
View File

@ -1010,7 +1010,6 @@ class TagsModel(QAbstractItemModel): # {{{
return return
fm_src = self.db.metadata_for_field(column) fm_src = self.db.metadata_for_field(column)
for id in ids: for id in ids:
vmap = {}
label = fm_src['label'] label = fm_src['label']
if not fm_src['is_custom']: if not fm_src['is_custom']:
if label == 'authors': if label == 'authors':

4
src/calibre/library/server/browse.py
View File

@ -623,8 +623,6 @@ class BrowseServer(object):
except: except:
raise cherrypy.HTTPError(404, 'Search: %r not understood'%which) raise cherrypy.HTTPError(404, 'Search: %r not understood'%which)
else: else:
if fm[category]['datatype'] == 'composite':
cid = cid.decode('utf-8')
all_ids = self.search_cache('') all_ids = self.search_cache('')
if category == 'newest': if category == 'newest':
ids = all_ids ids = all_ids
@ -632,6 +630,8 @@ class BrowseServer(object):
elif category == 'allbooks': elif category == 'allbooks':
ids = all_ids ids = all_ids
else: else:
if fm.get(category, {'datatype':None})['datatype'] == 'composite':
cid = cid.decode('utf-8')
q = category q = category
if q == 'news': if q == 'news':
q = 'tags' q = 'tags'