equal
deleted
inserted
replaced
57 abstract = True |
57 abstract = True |
58 |
58 |
59 def get_name(self): |
59 def get_name(self): |
60 from cm.cm_settings import DECORATED_CREATORS |
60 from cm.cm_settings import DECORATED_CREATORS |
61 |
61 |
62 if self.user and not DECORATED_CREATORS: |
62 if self.user and (not DECORATED_CREATORS or self.name == None): |
63 return self.user.username |
63 return self.user.username |
64 else: |
64 else: |
65 return self.name |
65 return self.name |
66 |
66 |
67 def get_email(self): |
67 def get_email(self): |
68 from cm.cm_settings import DECORATED_CREATORS |
68 from cm.cm_settings import DECORATED_CREATORS |
69 |
69 |
70 if self.user and not DECORATED_CREATORS: |
70 if self.user and (not DECORATED_CREATORS or self.email == None): |
71 return self.user.email |
71 return self.user.email |
72 else: |
72 else: |
73 return self.email |
73 return self.email |
74 |
74 |
75 def set_email_or_user(self, email_or_user): |
75 def set_email_or_user(self, email_or_user): |