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