OpenLP

Merge lp://qastaging/~phill-ridout/openlp/saved_bible_verses into lp://qastaging/openlp

  1. saved_bible_verses
  2. Merge into trunk
Proposed by Phill
Status: Superseded
Proposed branch: lp://qastaging/~phill-ridout/openlp/saved_bible_verses
Merge into: lp://qastaging/openlp
Diff against target: 1020 lines (+318/-196)
9 files modified
openlp/core/ui/lib/listwidgetwithdnd.py (+10/-4)
openlp/plugins/bibles/lib/__init__.py (+3/-3)
openlp/plugins/bibles/lib/db.py (+13/-0)
openlp/plugins/bibles/lib/manager.py (+15/-43)
openlp/plugins/bibles/lib/mediaitem.py (+178/-63)
resources/images/openlp-2.qrc (+2/-4)
tests/functional/openlp_core_ui_lib/test_listwidgetwithdnd.py (+33/-31)
tests/functional/openlp_plugins/bibles/test_mediaitem.py (+63/-47)
tests/interfaces/openlp_plugins/bibles/test_lib_parse_reference.py (+1/-1)
To merge this branch: bzr merge lp://qastaging/~phill-ridout/openlp/saved_bible_verses
Reviewer Review Type Date Requested Status
Tim Bentley Needs Fixing
Review via email: mp+323722@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2017-04-05.

This proposal has been superseded by a proposal from 2017-05-07.

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote : Posted in a previous version of this proposal

Please can you remove the resource file as this makes it difficult to see the changes.
The resource file can be merged in the next request,

review: Needs Fixing
Revision history for this message
Tim Bentley (trb143) wrote : Posted in a previous version of this proposal

Traceback (most recent call last):
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/bibles/lib/mediaitem.py", line 789, in on_search_timer_timeout
    self.text_search()
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/bibles/lib/mediaitem.py", line 765, in text_search
    self.display_results()
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/bibles/lib/mediaitem.py", line 798, in display_results
    self.current_results = self.build_display_results(self.bible, self.second_bible, self.search_results)
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/bibles/lib/mediaitem.py", line 814, in build_display_results
    version = self.plugin.manager.get_meta_data(self.bible.name, 'name').value
AttributeError: 'NoneType' object has no attribute 'name'

downloaded and started to no bibles loaded !!!!!!!

Loaded a new bible and started to type. Search as type fired and downloaded the chapter and gave me a message saying search as you type is not available!

Then a traceback
Traceback (most recent call last):
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/bibles/lib/mediaitem.py", line 789, in on_search_timer_timeout
    self.text_search()
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/bibles/lib/mediaitem.py", line 768, in text_search
    self.on_text_search(text)
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/bibles/lib/mediaitem.py", line 732, in on_text_search
    self.display_results()
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/bibles/lib/mediaitem.py", line 798, in display_results
    self.current_results = self.build_display_results(self.bible, self.second_bible, self.search_results)
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/bibles/lib/mediaitem.py", line 828, in build_display_results
    for count, verse in enumerate(search_results):
TypeError: 'NoneType' object is not iterable

On the select UI I only have 2 lines of search as the options is large and takes up most the the space.

review: Needs Fixing
Revision history for this message
Tim Bentley (trb143) wrote :

Traceback (most recent call last):
  File "./openlp.py", line 44, in <module>
    main()
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/core/__init__.py", line 439, in main
    sys.exit(application.run(qt_args))
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/core/__init__.py", line 145, in run
    self.main_window.show()
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/core/ui/mainwindow.py", line 626, in show
    self.service_manager_contents.load_last_file()
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/core/ui/servicemanager.py", line 841, in load_last_file
    self.load_file(file_name)
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/core/ui/servicemanager.py", line 770, in load_file
    self.process_service_items(items)
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/core/ui/servicemanager.py", line 829, in process_service_items
    new_item = Registry().get(service_item.name).service_load(service_item)
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/songs/lib/mediaitem.py", line 712, in service_load
    self.generate_footer(item, song)
  File "/home/tim/Projects/OpenLP/openlp/saved_bible_verses/openlp/plugins/songs/lib/mediaitem.py", line 663, in generate_footer
    if self.display_copyright_symbol:
AttributeError: 'SongMediaItem' object has no attribute 'display_copyright_symbol'

on start up!

review: Needs Fixing
lp://qastaging/~phill-ridout/openlp/saved_bible_verses updated
2744. By Phill

Annother fix

2745. By Phill

head

2746. By Phill

PEP

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.