mirror of
git://github.com/kovidgoyal/calibre.git
synced 2026-05-08 20:14:33 +02:00
Merge from trunk
This commit is contained in:
commit
5f4a828efe
1 changed files with 10 additions and 3 deletions
|
|
@ -291,7 +291,11 @@ def create_tag_browser_view(table_name, column_name, view_column_name):
|
|||
|
||||
for field in self.field_metadata.itervalues():
|
||||
if field['is_category'] and not field['is_custom'] and 'link_column' in field:
|
||||
create_tag_browser_view(field['table'], field['link_column'], field['column'])
|
||||
table = self.conn.get(
|
||||
'SELECT name FROM sqlite_master WHERE type="table" AND name=?',
|
||||
('books_%s_link'%field['table'],), all=False)
|
||||
if table is not None:
|
||||
create_tag_browser_view(field['table'], field['link_column'], field['column'])
|
||||
|
||||
def upgrade_version_11(self):
|
||||
'Add average rating to tag browser views'
|
||||
|
|
@ -363,8 +367,11 @@ def create_cust_tag_browser_view(table_name, link_table_name):
|
|||
|
||||
for field in self.field_metadata.itervalues():
|
||||
if field['is_category'] and not field['is_custom'] and 'link_column' in field:
|
||||
print field['table']
|
||||
create_std_tag_browser_view(field['table'], field['link_column'],
|
||||
table = self.conn.get(
|
||||
'SELECT name FROM sqlite_master WHERE type="table" AND name=?',
|
||||
('books_%s_link'%field['table'],), all=False)
|
||||
if table is not None:
|
||||
create_std_tag_browser_view(field['table'], field['link_column'],
|
||||
field['column'], field['category_sort'])
|
||||
|
||||
db_tables = self.conn.get('''SELECT name FROM sqlite_master
|
||||
|
|
|
|||
Loading…
Reference in a new issue