diff --git a/src/DisplayTabs/_EventEmbedList.py b/src/DisplayTabs/_EventEmbedList.py index 3c7e0e04c..fb68c03c4 100644 --- a/src/DisplayTabs/_EventEmbedList.py +++ b/src/DisplayTabs/_EventEmbedList.py @@ -204,6 +204,16 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList): except Errors.WindowActiveError: pass + def __blocked_text(self): + """ + Return the common text used when eventref cannot be edited + """ + return _("This event reference cannot be edited at this time. " + "Either the associated event is already being edited " + "or another event reference that is associated with " + "the same event is being edited.\n\nTo edit this event " + "reference, you need to close the event.") + def share_button_clicked(self, obj): from Selectors import selector_factory SelectEvent = selector_factory('Event') @@ -218,6 +228,9 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList): self.dbstate, self.uistate, self.track, event, ref, self.object_added) except Errors.WindowActiveError: + from QuestionDialog import WarningDialog + WarningDialog(_("Cannot share this reference"), + self.__blocked_text() ) pass def edit_button_clicked(self, obj): @@ -230,14 +243,8 @@ class EventEmbedList(DbGUIElement, GroupEmbeddedList): event, ref[1], self.object_edited) except Errors.WindowActiveError: from QuestionDialog import WarningDialog - WarningDialog( - _("Cannot edit this reference"), - _("This event reference cannot be edited at this time. " - "Either the associated event is already being edited " - "or another event reference that is associated with " - "the same event is being edited.\n\nTo edit this event " - "reference, you need to close the event.") - ) + WarningDialog(_("Cannot edit this reference"), + self.__blocked_text() ) elif ref and ref[0] != self._WORKGROUP: #bring up family editor key = self._groups[ref[0]][0] diff --git a/src/Selectors/_SelectEvent.py b/src/Selectors/_SelectEvent.py index 2cbde8bb5..772a10aed 100644 --- a/src/Selectors/_SelectEvent.py +++ b/src/Selectors/_SelectEvent.py @@ -70,7 +70,7 @@ class SelectEvent(BaseSelector): return self.db.get_event_from_handle def get_handle_column(self): - return 6 + return 7 def column_order(self): """