diff --git a/frontend/src/Activity/History/Details/HistoryDetails.js b/frontend/src/Activity/History/Details/HistoryDetails.js
index cc0e69fd5..a439194f6 100644
--- a/frontend/src/Activity/History/Details/HistoryDetails.js
+++ b/frontend/src/Activity/History/Details/HistoryDetails.js
@@ -60,6 +60,7 @@ function HistoryDetails(props) {
eventType,
sourceTitle,
data,
+ downloadId,
shortDateFormat,
timeFormat
} = props;
@@ -72,7 +73,6 @@ function HistoryDetails(props) {
nzbInfoUrl,
downloadClient,
downloadClientName,
- downloadId,
age,
ageHours,
ageMinutes,
@@ -90,20 +90,22 @@ function HistoryDetails(props) {
/>
{
- !!indexer &&
+ indexer ?
+ /> :
+ null
}
{
- !!releaseGroup &&
+ releaseGroup ?
+ /> :
+ null
}
{
@@ -119,7 +121,7 @@ function HistoryDetails(props) {
nzbInfoUrl ?
- Info URL
+ {translate('InfoUrl')}
@@ -139,27 +141,30 @@ function HistoryDetails(props) {
}
{
- !!downloadId &&
+ downloadId ?
+ /> :
+ null
}
{
- !!indexer &&
+ age || ageHours || ageMinutes ?
+ /> :
+ null
}
{
- !!publishedDate &&
+ publishedDate ?
+ /> :
+ null
}
);
@@ -179,11 +184,21 @@ function HistoryDetails(props) {
/>
{
- !!message &&
+ downloadId ?
+ :
+ null
+ }
+
+ {
+ message ?
+ /> :
+ null
}
);
@@ -205,12 +220,13 @@ function HistoryDetails(props) {
/>
{
- !!droppedPath &&
+ droppedPath ?
+ /> :
+ null
}
{
@@ -360,9 +376,9 @@ function HistoryDetails(props) {
const {
indexer,
releaseGroup,
+ customFormatScore,
nzbInfoUrl,
downloadClient,
- downloadId,
age,
ageHours,
ageMinutes,
@@ -377,64 +393,80 @@ function HistoryDetails(props) {
/>
{
- !!indexer &&
+ indexer ?
+ /> :
+ null
}
{
- !!releaseGroup &&
+ releaseGroup ?
+ /> :
+ null
}
{
- !!nzbInfoUrl &&
+ customFormatScore && customFormatScore !== '0' ?
+ :
+ null
+ }
+
+ {
+ nzbInfoUrl ?
- Info URL
+ {translate('InfoUrl')}
{nzbInfoUrl}
-
+ :
+ null
}
{
- !!downloadClient &&
+ downloadClient ?
+ /> :
+ null
}
{
- !!downloadId &&
+ downloadId ?
+ /> :
+ null
}
{
- !!indexer &&
+ age || ageHours || ageMinutes ?
+ /> :
+ null
}
{
- !!publishedDate &&
+ publishedDate ?
+ /> :
+ null
}
);
@@ -454,11 +486,21 @@ function HistoryDetails(props) {
/>
{
- !!message &&
+ downloadId ?
+ :
+ null
+ }
+
+ {
+ message ?
+ /> :
+ null
}
);
@@ -479,6 +521,7 @@ HistoryDetails.propTypes = {
eventType: PropTypes.string.isRequired,
sourceTitle: PropTypes.string.isRequired,
data: PropTypes.object.isRequired,
+ downloadId: PropTypes.string,
shortDateFormat: PropTypes.string.isRequired,
timeFormat: PropTypes.string.isRequired
};
diff --git a/frontend/src/Activity/History/Details/HistoryDetailsModal.js b/frontend/src/Activity/History/Details/HistoryDetailsModal.js
index 187db9cd4..5362a2f43 100644
--- a/frontend/src/Activity/History/Details/HistoryDetailsModal.js
+++ b/frontend/src/Activity/History/Details/HistoryDetailsModal.js
@@ -42,6 +42,7 @@ function HistoryDetailsModal(props) {
eventType,
sourceTitle,
data,
+ downloadId,
isMarkingAsFailed,
shortDateFormat,
timeFormat,
@@ -64,6 +65,7 @@ function HistoryDetailsModal(props) {
eventType={eventType}
sourceTitle={sourceTitle}
data={data}
+ downloadId={downloadId}
shortDateFormat={shortDateFormat}
timeFormat={timeFormat}
/>
@@ -98,6 +100,7 @@ HistoryDetailsModal.propTypes = {
eventType: PropTypes.string.isRequired,
sourceTitle: PropTypes.string.isRequired,
data: PropTypes.object.isRequired,
+ downloadId: PropTypes.string,
isMarkingAsFailed: PropTypes.bool.isRequired,
shortDateFormat: PropTypes.string.isRequired,
timeFormat: PropTypes.string.isRequired,
diff --git a/frontend/src/Activity/History/HistoryRow.js b/frontend/src/Activity/History/HistoryRow.js
index 23dea5416..9f2da78d0 100644
--- a/frontend/src/Activity/History/HistoryRow.js
+++ b/frontend/src/Activity/History/HistoryRow.js
@@ -65,6 +65,7 @@ class HistoryRow extends Component {
sourceTitle,
date,
data,
+ downloadId,
isMarkingAsFailed,
columns,
shortDateFormat,
@@ -244,6 +245,7 @@ class HistoryRow extends Component {
eventType={eventType}
sourceTitle={sourceTitle}
data={data}
+ downloadId={downloadId}
isMarkingAsFailed={isMarkingAsFailed}
shortDateFormat={shortDateFormat}
timeFormat={timeFormat}
@@ -269,6 +271,7 @@ HistoryRow.propTypes = {
sourceTitle: PropTypes.string.isRequired,
date: PropTypes.string.isRequired,
data: PropTypes.object.isRequired,
+ downloadId: PropTypes.string,
isMarkingAsFailed: PropTypes.bool,
markAsFailedError: PropTypes.object,
columns: PropTypes.arrayOf(PropTypes.object).isRequired,
diff --git a/frontend/src/Artist/History/ArtistHistoryRow.js b/frontend/src/Artist/History/ArtistHistoryRow.js
index d48e2eb31..4b2dfff42 100644
--- a/frontend/src/Artist/History/ArtistHistoryRow.js
+++ b/frontend/src/Artist/History/ArtistHistoryRow.js
@@ -82,6 +82,7 @@ class ArtistHistoryRow extends Component {
customFormatScore,
date,
data,
+ downloadId,
album
} = this.props;
@@ -128,6 +129,7 @@ class ArtistHistoryRow extends Component {
eventType={eventType}
sourceTitle={sourceTitle}
data={data}
+ downloadId={downloadId}
/>
}
position={tooltipPositions.LEFT}
@@ -180,6 +182,7 @@ ArtistHistoryRow.propTypes = {
customFormatScore: PropTypes.number.isRequired,
date: PropTypes.string.isRequired,
data: PropTypes.object.isRequired,
+ downloadId: PropTypes.string,
fullArtist: PropTypes.bool.isRequired,
artist: PropTypes.object.isRequired,
album: PropTypes.object.isRequired,
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index d1274ae74..05f4a994b 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -401,7 +401,7 @@
"GoToArtistListing": "Go to artist listing",
"GoToInterp": "Go to {0}",
"Grab": "Grab",
- "GrabID": "Grab ID",
+ "GrabId": "Grab ID",
"GrabRelease": "Grab Release",
"GrabReleaseMessageText": "Lidarr was unable to determine which artist and album this release was for. Lidarr may be unable to automatically import this release. Do you want to grab '{0}'?",
"GrabSelected": "Grab Selected",
@@ -474,6 +474,7 @@
"IndexerTagHelpText": "Only use this indexer for artist with at least one matching tag. Leave blank to use with all artists.",
"Indexers": "Indexers",
"Info": "Info",
+ "InfoUrl": "Info URL",
"InstanceName": "Instance Name",
"InstanceNameHelpText": "Instance name in tab and for Syslog app name",
"InteractiveImport": "Interactive Import",