raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a validation bug with presentations being loaded from services 

Fix range bug stopping service items being triggered unless it was the first!

bzr-revno: 2389
This commit is contained in:
Tim Bentley 2014-06-08 18:55:06 +01:00
parent 007e18945e 567b3f4b57
commit 8d67406728
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openlp/core/ui/servicemanager.py
View File

@ -401,9 +401,12 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
:param suffix_list: New Suffix's to be supported :param suffix_list: New Suffix's to be supported
""" """
for suffix in suffix_list: if isinstance(suffix_list, str):
if suffix not in self.suffixes: self.suffixes.append(suffix_list)
self.suffixes.append(suffix) else:
for suffix in suffix_list:
if suffix not in self.suffixes:
self.suffixes.append(suffix)
def on_new_service_clicked(self, field=None): def on_new_service_clicked(self, field=None):
""" """
@ -1081,6 +1084,7 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
:param field: :param field:
:param message: The data passed in from a remove message :param message: The data passed in from a remove message
""" """
self.log_debug(message)
self.set_item(int(message)) self.set_item(int(message))
def set_item(self, index): def set_item(self, index):
@ -1089,7 +1093,7 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
:param index: The index of the service item list to be actioned. :param index: The index of the service item list to be actioned.
""" """
if 0 >= index < self.service_manager_list.topLevelItemCount(): if 0 <= index < self.service_manager_list.topLevelItemCount():
item = self.service_manager_list.topLevelItem(index) item = self.service_manager_list.topLevelItem(index)
self.service_manager_list.setCurrentItem(item) self.service_manager_list.setCurrentItem(item)
self.make_live() self.make_live()

16
tests/functional/openlp_core_ui/test_servicemanager.py
View File

@ -71,7 +71,21 @@ class TestServiceManager(TestCase):
service_manager._save_lite = False service_manager._save_lite = False
service_manager.service_theme = 'test_theme' service_manager.service_theme = 'test_theme'
service = service_manager.create_basic_service()[0] service = service_manager.create_basic_service()[0]
# THEN: The the controller should be registered in the registry. # THEN: The controller should be registered in the registry.
self.assertNotEqual(service, None, 'The base service should be created') self.assertNotEqual(service, None, 'The base service should be created')
self.assertEqual(service['openlp_core']['service-theme'], 'test_theme', 'The test theme should be saved') self.assertEqual(service['openlp_core']['service-theme'], 'test_theme', 'The test theme should be saved')
self.assertEqual(service['openlp_core']['lite-service'], False, 'The lite service should be saved') self.assertEqual(service['openlp_core']['lite-service'], False, 'The lite service should be saved')
def supported_suffixes_test(self):
"""
Test the create basic service array
"""
# GIVEN: A new service manager instance.
service_manager = ServiceManager(None)
# WHEN: a suffix is added as an individual or a list.
service_manager.supported_suffixes('txt')
service_manager.supported_suffixes(['pptx', 'ppt'])
# THEN: The suffixes should be available to test.
self.assertEqual('txt' in service_manager.suffixes, True, 'The suffix txt should be in the list')
self.assertEqual('ppt' in service_manager.suffixes, True, 'The suffix ppt should be in the list')
self.assertEqual('pptx' in service_manager.suffixes, True, 'The suffix pptx should be in the list')