forked from openlp/openlp
Fix remote Search displaying errors on UI
This commit is contained in:
parent
ccfa08d93c
commit
b092f19606
@ -641,7 +641,7 @@ class MediaManagerItem(QtGui.QWidget):
|
|||||||
if item:
|
if item:
|
||||||
self.autoSelectId = item.data(QtCore.Qt.UserRole).toInt()[0]
|
self.autoSelectId = item.data(QtCore.Qt.UserRole).toInt()[0]
|
||||||
|
|
||||||
def search(self, string):
|
def search(self, string, showError=True):
|
||||||
"""
|
"""
|
||||||
Performs a plugin specific search for items containing ``string``
|
Performs a plugin specific search for items containing ``string``
|
||||||
"""
|
"""
|
||||||
|
@ -1013,6 +1013,7 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
The verse number (int).
|
The verse number (int).
|
||||||
"""
|
"""
|
||||||
verse_separator = get_reference_separator(u'sep_v_display')
|
verse_separator = get_reference_separator(u'sep_v_display')
|
||||||
|
if not self.settings.show_new_chapters or old_chapter != chapter:
|
||||||
verse_text = unicode(chapter) + verse_separator + unicode(verse)
|
verse_text = unicode(chapter) + verse_separator + unicode(verse)
|
||||||
else:
|
else:
|
||||||
verse_text = unicode(verse)
|
verse_text = unicode(verse)
|
||||||
@ -1024,12 +1025,13 @@ class BibleMediaItem(MediaManagerItem):
|
|||||||
return u'{su}[%s]{/su}' % verse_text
|
return u'{su}[%s]{/su}' % verse_text
|
||||||
return u'{su}%s{/su}' % verse_text
|
return u'{su}%s{/su}' % verse_text
|
||||||
|
|
||||||
def search(self, string):
|
def search(self, string, showError):
|
||||||
"""
|
"""
|
||||||
Search for some Bible verses (by reference).
|
Search for some Bible verses (by reference).
|
||||||
"""
|
"""
|
||||||
bible = unicode(self.quickVersionComboBox.currentText())
|
bible = unicode(self.quickVersionComboBox.currentText())
|
||||||
search_results = self.plugin.manager.get_verses(bible, string, False)
|
search_results = self.plugin.manager.get_verses(bible, string, False,
|
||||||
|
showError)
|
||||||
if search_results:
|
if search_results:
|
||||||
versetext = u' '.join([verse.text for verse in search_results])
|
versetext = u' '.join([verse.text for verse in search_results])
|
||||||
return [[string, versetext]]
|
return [[string, versetext]]
|
||||||
|
@ -267,7 +267,7 @@ class CustomMediaItem(MediaManagerItem):
|
|||||||
self.searchTextEdit.clear()
|
self.searchTextEdit.clear()
|
||||||
self.onSearchTextButtonClick()
|
self.onSearchTextButtonClick()
|
||||||
|
|
||||||
def search(self, string):
|
def search(self, string, showError):
|
||||||
search_results = self.manager.get_all_objects(CustomSlide,
|
search_results = self.manager.get_all_objects(CustomSlide,
|
||||||
or_(func.lower(CustomSlide.title).like(u'%' +
|
or_(func.lower(CustomSlide.title).like(u'%' +
|
||||||
string.lower() + u'%'),
|
string.lower() + u'%'),
|
||||||
|
@ -234,7 +234,7 @@ class ImageMediaItem(MediaManagerItem):
|
|||||||
'There was a problem replacing your background, '
|
'There was a problem replacing your background, '
|
||||||
'the image file "%s" no longer exists.')) % filename)
|
'the image file "%s" no longer exists.')) % filename)
|
||||||
|
|
||||||
def search(self, string):
|
def search(self, string, showError):
|
||||||
files = SettingsManager.load_list(self.settingsSection, u'images')
|
files = SettingsManager.load_list(self.settingsSection, u'images')
|
||||||
results = []
|
results = []
|
||||||
string = string.lower()
|
string = string.lower()
|
||||||
|
@ -310,7 +310,7 @@ class MediaMediaItem(MediaManagerItem):
|
|||||||
media = filter(lambda x: os.path.splitext(x)[1] in ext, media)
|
media = filter(lambda x: os.path.splitext(x)[1] in ext, media)
|
||||||
return media
|
return media
|
||||||
|
|
||||||
def search(self, string):
|
def search(self, string, showError):
|
||||||
files = SettingsManager.load_list(self.settingsSection, u'media')
|
files = SettingsManager.load_list(self.settingsSection, u'media')
|
||||||
results = []
|
results = []
|
||||||
string = string.lower()
|
string = string.lower()
|
||||||
|
@ -322,7 +322,7 @@ class PresentationMediaItem(MediaManagerItem):
|
|||||||
return controller
|
return controller
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def search(self, string):
|
def search(self, string, showError):
|
||||||
files = SettingsManager.load_list(
|
files = SettingsManager.load_list(
|
||||||
self.settingsSection, u'presentations')
|
self.settingsSection, u'presentations')
|
||||||
results = []
|
results = []
|
||||||
|
@ -522,7 +522,7 @@ class HttpConnection(object):
|
|||||||
plugin = self.parent.plugin.pluginManager.get_plugin_by_name(type)
|
plugin = self.parent.plugin.pluginManager.get_plugin_by_name(type)
|
||||||
if plugin.status == PluginStatus.Active and \
|
if plugin.status == PluginStatus.Active and \
|
||||||
plugin.mediaItem and plugin.mediaItem.hasSearch:
|
plugin.mediaItem and plugin.mediaItem.hasSearch:
|
||||||
results = plugin.mediaItem.search(text)
|
results = plugin.mediaItem.search(text, False)
|
||||||
else:
|
else:
|
||||||
results = []
|
results = []
|
||||||
return HttpResponse(
|
return HttpResponse(
|
||||||
|
@ -586,7 +586,7 @@ class SongMediaItem(MediaManagerItem):
|
|||||||
Receiver.send_message(u'service_item_update',
|
Receiver.send_message(u'service_item_update',
|
||||||
u'%s:%s:%s' % (editId, item._uuid, temporary))
|
u'%s:%s:%s' % (editId, item._uuid, temporary))
|
||||||
|
|
||||||
def search(self, string):
|
def search(self, string, showError):
|
||||||
"""
|
"""
|
||||||
Search for some songs
|
Search for some songs
|
||||||
"""
|
"""
|
||||||
|
Loading…
Reference in New Issue
Block a user