Skip to content

Commit

Permalink
Merge branch 'master' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
MonkeyDo committed Mar 4, 2022
2 parents d81c056 + b919b95 commit 5786115
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/client/components/pages/entities/work-table.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function WorkTableRow({showAddedAtColumn, work, showCheckboxes, selectedEntities
<a href={`/work/${work.bbid}`}>{name}</a>
{disambiguation}
</td>
<td>{authorData.length ? renderAuthors(authorData) : '?'}</td>
{authorData && <td>{authorData.length ? renderAuthors(authorData) : '?'}</td>}
<td>{languages}</td>
<td>{workType}</td>
{showAddedAtColumn ? <td>{addedAt}</td> : null}
Expand All @@ -88,14 +88,15 @@ WorkTableRow.defaultProps = {
function WorkTable({entity, showAddedAtColumn, works, showAdd, showCheckboxes, selectedEntities, onToggleRow}) {
let tableContent;
if (works.length) {
const showAuthors = works[0].authorsData;
tableContent = (
<React.Fragment>
<Table striped>
<thead>
<tr>
{works[0].displayNumber && <th style={{width: '10%'}}>#</th>}
<th>Name</th>
<th>Author</th>
{showAuthors && <th>Author</th>}
<th>Languages</th>
<th>Type</th>
{
Expand Down
1 change: 1 addition & 0 deletions src/client/entity-editor/name-section/name-section.js
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ class NameSection extends React.Component {
{exactMatches.map((match) =>
(
<ListGroup.Item
action
href={`/${_.kebabCase(entityType)}/${match.bbid}`}
key={`${match.bbid}`}
rel="noopener noreferrer" target="_blank"
Expand Down

0 comments on commit 5786115

Please sign in to comment.