Skip to content

Commit

Permalink
Merge pull request #6018 from viown/fix-device-name
Browse files Browse the repository at this point in the history
Prefer custom device name in device access list
  • Loading branch information
thornbill authored Sep 20, 2024
2 parents ef6d9c7 + 9716578 commit f0b50db
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/apps/dashboard/routes/users/access.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ type ItemsArr = {
Name?: string | null;
Id?: string | null;
AppName?: string | null;
CustomName?: string | null;
checkedAttribute?: string
};

Expand Down Expand Up @@ -112,6 +113,7 @@ const UserLibraryAccess = () => {
Id: device.Id,
Name: device.Name,
AppName: device.AppName,
CustomName: device.CustomName,
checkedAttribute: checkedAttribute
});
}
Expand Down Expand Up @@ -307,7 +309,7 @@ const UserLibraryAccess = () => {
key={Item.Id}
className='chkDevice'
itemId={Item.Id}
itemName={Item.Name}
itemName={Item.CustomName || Item.Name}
itemAppName={Item.AppName}
itemCheckedAttribute={Item.checkedAttribute}
/>
Expand Down

0 comments on commit f0b50db

Please sign in to comment.