Finish merging bug# 6960 fix from trunk

I don't know why git diff didn't pick up citation.py :(

svn: r22963
This commit is contained in:
Vassilii Khachaturov 2013-08-30 19:14:58 +00:00
parent d9eab10013
commit 8c3e4701d9

View File

@ -44,13 +44,15 @@ from .mediabase import MediaBase
from .notebase import NoteBase from .notebase import NoteBase
from .datebase import DateBase from .datebase import DateBase
from ..constfunc import cuni from ..constfunc import cuni
from .citationbase import IndirectCitationBase
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
# Citation class # Citation class
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class Citation(MediaBase, NoteBase, PrimaryObject, DateBase): class Citation(MediaBase, NoteBase, IndirectCitationBase,
PrimaryObject, DateBase):
""" """
A record of a citation of a source of information. A record of a citation of a source of information.
@ -225,6 +227,16 @@ class Citation(MediaBase, NoteBase, PrimaryObject, DateBase):
""" """
return self.media_list return self.media_list
def get_citation_child_list(self):
"""
Return the list of child secondary objects that may refer citations.
:returns: Returns the list of child secondary child objects that may
refer citations.
:rtype: list
"""
return self.media_list
def get_handle_referents(self): def get_handle_referents(self):
""" """
Return the list of child objects which may, directly or through Return the list of child objects which may, directly or through