From a999e59a4f36503f36d51700042a4628ad2af9b1 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Sun, 20 Apr 2014 16:36:56 +0200 Subject: [PATCH] Fixes for merge --- openlp/core/lib/serviceitem.py | 2 +- tests/resources/serviceitem-dvd.osj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openlp/core/lib/serviceitem.py b/openlp/core/lib/serviceitem.py index b1e254f82..7e9528503 100644 --- a/openlp/core/lib/serviceitem.py +++ b/openlp/core/lib/serviceitem.py @@ -435,7 +435,7 @@ class ServiceItem(RegistryProperties): Returns the title of the service item. """ if self.is_text() or self.is_capable(ItemCapabilities.IsOptical) \ - or self.is_capable(temCapabilities.CanEditTitle): + or self.is_capable(ItemCapabilities.CanEditTitle): return self.title else: if len(self._raw_frames) > 1: diff --git a/tests/resources/serviceitem-dvd.osj b/tests/resources/serviceitem-dvd.osj index d3d224bff..cda95e592 100644 --- a/tests/resources/serviceitem-dvd.osj +++ b/tests/resources/serviceitem-dvd.osj @@ -1 +1 @@ -[{"serviceitem": {"header": {"auto_play_slides_once": false, "data": "", "processor": "Automatic", "theme": -1, "theme_overwritten": false, "end_time": 672.069, "start_time": 654.375, "capabilities": [12, 17, 16, 4], "media_length": 17.694, "audit": "", "xml_version": null, "title": "/dev/sr0@00:06:15,375-00:01:09,069", "auto_play_slides_loop": false, "notes": "", "icon": ":/plugins/plugin_media.png", "type": 3, "background_audio": [], "plugin": "media", "from_plugin": false, "search": "", "will_auto_start": false, "name": "media", "footer": [], "timed_slide_interval": 0}, "data": [{"image": ":/media/slidecontroller_multimedia.png", "path": "optical:1:5:3:654375:672069:/dev/sr0", "title": "/dev/sr0"}]}}] +[{"serviceitem": {"header": {"auto_play_slides_once": false, "data": "", "processor": "Automatic", "theme": -1, "theme_overwritten": false, "end_time": 672.069, "start_time": 654.375, "capabilities": [12, 18, 16, 4], "media_length": 17.694, "audit": "", "xml_version": null, "title": "/dev/sr0@00:06:15,375-00:01:09,069", "auto_play_slides_loop": false, "notes": "", "icon": ":/plugins/plugin_media.png", "type": 3, "background_audio": [], "plugin": "media", "from_plugin": false, "search": "", "will_auto_start": false, "name": "media", "footer": [], "timed_slide_interval": 0}, "data": [{"image": ":/media/slidecontroller_multimedia.png", "path": "optical:1:5:3:654375:672069:/dev/sr0", "title": "/dev/sr0"}]}}]