Commit c284d1c7 authored by Maksym Tishchenko's avatar Maksym Tishchenko Committed by Matija Obreza
Browse files

Merge branch '237-inventory-barcode-field-not-visible' into 'main'

Resolve "Inventory. Barcode field not visible."

Closes #237

See merge request grin-global/grin-global-ui!225

(cherry picked from commit 7676b54f)
parent 2004de9f
......@@ -123,8 +123,8 @@ class BrowsePage extends React.Component<IBrowsePageProps> {
return (
<>
<PageTitle title={ data?.totalElements ? t('accession.browse.title', { count: data.totalElements }) : t('accession.browse.loading') }/>
<ContentHeader title={ data?.totalElements ? t('accession.browse.title', { count: data.totalElements }) : t('accession.browse.loading') }>
<PageTitle title={ data ? t('accession.browse.title', { count: data?.totalElements }) : t('accession.browse.loading') }/>
<ContentHeader title={ data ? t('accession.browse.title', { count: data?.totalElements }) : t('accession.browse.loading') }>
<FiltersButton>
<Filters
onSubmit={ applyFilter }
......
......@@ -144,8 +144,8 @@ class BrowsePage extends React.Component<IBrowsePageProps> {
return (
<>
<PageTitle title={ data && data.totalElements ? t('inventory.browse.title', { count: data.totalElements }) : t('inventory.browse.loading') }/>
<ContentHeader title={ data && data.totalElements ? t('inventory.browse.title', { count: data.totalElements }) : t('inventory.browse.loading') }>
<PageTitle title={ data ? t('inventory.browse.title', { count: data?.totalElements }) : t('inventory.browse.loading') }/>
<ContentHeader title={ data ? t('inventory.browse.title', { count: data?.totalElements }) : t('inventory.browse.loading') }>
<FiltersButton>
<Filters
onSubmit={ applyFilter }
......
......@@ -458,6 +458,12 @@ class InventoryDetailsPage extends React.Component<IDetailsPageProps> {
<InventoryLink inventory={ inventory.parentInventory }/>
</PropertiesItem>
}
{ inventory.barcode &&
<PropertiesItem title={ t(['client:model.Inventory.barcode', 'client:model._.barcode']) }>
<code>{ inventory.barcode }</code>
</PropertiesItem>
}
{ inventory.storageLocationPart1 &&
<>
<h3 className={ classes.h2 }>Storage</h3>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment