Commit d45def75 authored by Tomas Taraba's avatar Tomas Taraba

3386 Explicitly import labels module

parent e7f30d97
......@@ -23,4 +23,5 @@ from xivo_dao.alchemy.linefeatures import LineFeatures
from xivo_dao.alchemy.userlabels import UserLabels
from xivo_dao.alchemy.user_line import UserLine
from xivo_dao.alchemy.userfeatures import UserFeatures
from xivo_dao.alchemy.labels import Labels
from xivo_dao.alchemy.voicemail import Voicemail
......@@ -59,7 +59,6 @@ caller_id_regex = re.compile(r'''
class UserFeatures(Base):
__tablename__ = 'userfeatures'
__table_args__ = (
PrimaryKeyConstraint('id'),
......@@ -144,8 +143,7 @@ class UserFeatures(Base):
voicemail = relationship("Voicemail")
cti_profile = relationship("CtiProfile")
labels = relationship("UserLabels",
primaryjoin="""UserFeatures.id == UserLabels.user_id""")
primaryjoin="""UserFeatures.id == UserLabels.user_id""")
def extrapolate_caller_id(self, extension=None):
default_num = extension.exten if extension else None
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment