diff --git a/frontend/src/Activity/History/Details/HistoryDetails.js b/frontend/src/Activity/History/Details/HistoryDetails.js
index 81cd7ba0c..a32f249e0 100644
--- a/frontend/src/Activity/History/Details/HistoryDetails.js
+++ b/frontend/src/Activity/History/Details/HistoryDetails.js
@@ -15,6 +15,7 @@ function HistoryDetails(props) {
eventType,
sourceTitle,
data,
+ downloadId,
shortDateFormat,
timeFormat
} = props;
@@ -26,7 +27,6 @@ function HistoryDetails(props) {
nzbInfoUrl,
downloadClient,
downloadClientName,
- downloadId,
movieMatchType,
age,
ageHours,
@@ -45,24 +45,26 @@ function HistoryDetails(props) {
/>
{
- !!indexer &&
+ indexer ?
+ /> :
+ null
}
{
- !!releaseGroup &&
+ releaseGroup ?
+ /> :
+ null
}
{
- !!nzbInfoUrl &&
+ nzbInfoUrl ?
Info URL
@@ -71,7 +73,8 @@ function HistoryDetails(props) {
{nzbInfoUrl}
-
+ :
+ null
}
{
@@ -94,27 +97,30 @@ function HistoryDetails(props) {
}
{
- !!downloadId &&
+ downloadId ?
+ /> :
+ null
}
{
- !!indexer &&
+ indexer ?
+ /> :
+ null
}
{
- !!publishedDate &&
+ publishedDate ?
+ /> :
+ null
}
);
@@ -134,11 +140,21 @@ function HistoryDetails(props) {
/>
{
- !!message &&
+ downloadId ?
+ :
+ null
+ }
+
+ {
+ message ?
+ /> :
+ null
}
);
@@ -159,21 +175,23 @@ function HistoryDetails(props) {
/>
{
- !!droppedPath &&
+ droppedPath ?
+ /> :
+ null
}
{
- !!importedPath &&
+ importedPath ?
+ /> :
+ null
}
);
@@ -262,11 +280,21 @@ function HistoryDetails(props) {
/>
{
- !!message &&
+ downloadId ?
+ :
+ null
+ }
+
+ {
+ message ?
+ /> :
+ null
}
);
@@ -287,6 +315,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 b5e5c0622..56147ec98 100644
--- a/frontend/src/Activity/History/Details/HistoryDetailsModal.js
+++ b/frontend/src/Activity/History/Details/HistoryDetailsModal.js
@@ -37,6 +37,7 @@ function HistoryDetailsModal(props) {
eventType,
sourceTitle,
data,
+ downloadId,
isMarkingAsFailed,
shortDateFormat,
timeFormat,
@@ -59,6 +60,7 @@ function HistoryDetailsModal(props) {
eventType={eventType}
sourceTitle={sourceTitle}
data={data}
+ downloadId={downloadId}
shortDateFormat={shortDateFormat}
timeFormat={timeFormat}
/>
@@ -73,7 +75,7 @@ function HistoryDetailsModal(props) {
isSpinning={isMarkingAsFailed}
onPress={onMarkAsFailedPress}
>
- Mark as Failed
+ {translate('MarkAsFailed')}
}
@@ -93,6 +95,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 e2e858a68..9cdfa0e1a 100644
--- a/frontend/src/Activity/History/HistoryRow.js
+++ b/frontend/src/Activity/History/HistoryRow.js
@@ -64,6 +64,7 @@ class HistoryRow extends Component {
sourceTitle,
date,
data,
+ downloadId,
isMarkingAsFailed,
columns,
shortDateFormat,
@@ -233,6 +234,7 @@ class HistoryRow extends Component {
eventType={eventType}
sourceTitle={sourceTitle}
data={data}
+ downloadId={downloadId}
isMarkingAsFailed={isMarkingAsFailed}
shortDateFormat={shortDateFormat}
timeFormat={timeFormat}
@@ -257,6 +259,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/Movie/History/MovieHistoryRow.js b/frontend/src/Movie/History/MovieHistoryRow.js
index b26fdbabc..8c3dae134 100644
--- a/frontend/src/Movie/History/MovieHistoryRow.js
+++ b/frontend/src/Movie/History/MovieHistoryRow.js
@@ -68,6 +68,7 @@ class MovieHistoryRow extends Component {
qualityCutoffNotMet,
date,
data,
+ downloadId,
isMarkingAsFailed,
shortDateFormat,
timeFormat
@@ -153,6 +154,7 @@ class MovieHistoryRow extends Component {
eventType={eventType}
sourceTitle={sourceTitle}
data={data}
+ downloadId={downloadId}
isMarkingAsFailed={isMarkingAsFailed}
shortDateFormat={shortDateFormat}
timeFormat={timeFormat}
@@ -175,6 +177,7 @@ MovieHistoryRow.propTypes = {
qualityCutoffNotMet: PropTypes.bool.isRequired,
date: PropTypes.string.isRequired,
data: PropTypes.object.isRequired,
+ downloadId: PropTypes.string,
isMarkingAsFailed: PropTypes.bool,
movie: PropTypes.object.isRequired,
shortDateFormat: PropTypes.string.isRequired,