fix: #601 Fix copy inconsistency (#609)

apptension · Jul 30, 2024 · d34eab4 · d34eab4
1 parent daa164f
commit d34eab4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/packages/backend/apps/users/models.py b/packages/backend/apps/users/models.py
@@ -101,4 +101,5 @@ class UserProfile(models.Model):
     )
 
     def __str__(self) -> str:
-        return f"{self.first_name} {self.last_name}"
+        full_name = f"{self.first_name} {self.last_name}".strip()
+        return full_name if full_name else self.user.email
diff --git a/...ibs/webapp-tenants/src/components/tenantInvitationForm/tenantInvitationForm.component.tsx b/...ibs/webapp-tenants/src/components/tenantInvitationForm/tenantInvitationForm.component.tsx
@@ -84,7 +84,7 @@ export const TenantInvitationForm = ({ initialData, onSubmit, error, loading }:
                           id: 'Tenant invitation form / Email label',
                         })}
                         placeholder={intl.formatMessage({
-                          defaultMessage: 'Name',
+                          defaultMessage: 'Email',
                           id: 'Tenant invitation form / Email placeholder',
                         })}
                         error={errors.email?.message}

diff --git a/...p-libs/webapp-tenants/src/routes/tenantSettings/tenantMembers/tenantMembers.component.tsx b/...p-libs/webapp-tenants/src/routes/tenantSettings/tenantMembers/tenantMembers.component.tsx
@@ -45,7 +45,7 @@ export const TenantMembers = () => {
             </Paragraph>
             <Button data-testid="tenant-members-create-button" color="primary" size="sm" onClick={handleNewTenantClick}>
               <Plus className="mr-1" size="16" />{' '}
-              <FormattedMessage defaultMessage="Create new tenant" id="TenantSwitch / Create new organization" />
+              <FormattedMessage defaultMessage="Create new organization" id="TenantSwitch / Create new organization" />
             </Button>
           </Alert>
         ) : (

diff --git a/packages/workers/userauth/models.py b/packages/workers/userauth/models.py
@@ -23,6 +23,9 @@ class User(models.Base):
     cruddemoitem_set: Mapped[List["CrudDemoItem"]] = relationship(back_populates="created_by")
     documents: Mapped[List["DocumentDemoItem"]] = relationship(back_populates="created_by")
 
+    def __str__(self):
+        return self.email
+
 
 class UserProfile(models.Base):
     __tablename__ = "users_userprofile"
@@ -34,3 +37,7 @@ class UserProfile(models.Base):
 
     first_name = Column("first_name", String)
     last_name = Column("last_name", String)
+
+    def __str__(self):
+        full_name = f"{self.first_name} {self.last_name}".strip()
+        return full_name if full_name else self.user.email