mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

fix merge conflict

Browse source
This commit is contained in:
viown 2024-09-04 11:28:57 +03:00 • committed by Bill Thornton
parent ef6d9c7241
commit 9716578f05
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/apps/dashboard/routes/users/access.tsx
View file

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