diff --git a/docs/de/user/admin/assets/administration-information.png b/docs/de/user/admin/assets/administration-information.png index 1050025588..71630d7ddd 100644 Binary files a/docs/de/user/admin/assets/administration-information.png and b/docs/de/user/admin/assets/administration-information.png differ diff --git a/docs/de/user/admin/index.md b/docs/de/user/admin/index.md index 2eeb57996b..3f88a4c402 100644 --- a/docs/de/user/admin/index.md +++ b/docs/de/user/admin/index.md @@ -11,6 +11,6 @@ Im Bereich Administration kann die SCM-Manager Instanz administriert werden. Von ### Information -Auf der Informationsseite in der Administration findet man die aktuelle Version der SCM-Manager Instanz und hilfreiche Links zur Kontaktaufnahme mit dem SCM-Manager Support-Team. +Auf der Informationsseite in der Administration findet man die aktuelle Version der SCM-Manager Instanz und hilfreiche Links zur Kontaktaufnahme mit dem SCM-Manager Support-Team. Falls eine neuere Version des SCM-Managers verfügbar ist, wird der Link zum Download-Bereich der offiziellen Webseite angezeigt. ![Administration-Information](assets/administration-information.png) diff --git a/docs/en/user/admin/assets/administration-information.png b/docs/en/user/admin/assets/administration-information.png index 64ffd1d7a8..ee60458cff 100644 Binary files a/docs/en/user/admin/assets/administration-information.png and b/docs/en/user/admin/assets/administration-information.png differ diff --git a/docs/en/user/admin/index.md b/docs/en/user/admin/index.md index 7c5f30c2cb..d2e77554d1 100644 --- a/docs/en/user/admin/index.md +++ b/docs/en/user/admin/index.md @@ -9,6 +9,6 @@ The SCM-Manager instance can be administered in the Administration area. From he * [Settings](settings/) ### Information -On the information page in the administration area you can find the version of your SCM-Manager instance and helpful links to get in touch with the SCM-Manager support team. +On the information page in the administration area you can find the version of your SCM-Manager instance and helpful links to get in touch with the SCM-Manager support team. If there is a newer version for SCM-Manager, it will be shown with the link to the download section on the official SCM-Manager homepage. ![Administration-Information](assets/administration-information.png) diff --git a/scm-ui/ui-webapp/src/admin/containers/AdminDetails.tsx b/scm-ui/ui-webapp/src/admin/containers/AdminDetails.tsx index d7db2b4c3a..4e9e230d31 100644 --- a/scm-ui/ui-webapp/src/admin/containers/AdminDetails.tsx +++ b/scm-ui/ui-webapp/src/admin/containers/AdminDetails.tsx @@ -25,7 +25,7 @@ import React from "react"; import { connect } from "react-redux"; import { WithTranslation, withTranslation } from "react-i18next"; import styled from "styled-components"; -import { apiClient, ErrorNotification, Image, Loading, Subtitle, Title } from "@scm-manager/ui-components"; +import { apiClient, Image, Loading, Subtitle, Title } from "@scm-manager/ui-components"; import { getAppVersion, getReleaseInfoLink } from "../../modules/indexResource"; type Props = WithTranslation & { @@ -35,7 +35,6 @@ type Props = WithTranslation & { type State = { loading: boolean; - error?: Error; releaseInfo?: ReleaseInfo; }; @@ -73,22 +72,20 @@ class AdminDetails extends React.Component { const { releaseInfoLink } = this.props; if (releaseInfoLink) { + this.setState({ loading: true }); apiClient .get(releaseInfoLink) .then(r => r.json()) .then(releaseInfo => this.setState({ releaseInfo })) .then(() => this.setState({ loading: false })) - .catch(error => this.setState({ error })); + // ignore errors for this action + .catch(() => this.setState({ loading: false })); } } render() { const { version, t } = this.props; - const { loading, error, releaseInfo } = this.state; - - if (error) { - return ; - } + const { loading, releaseInfo } = this.state; if (loading) { return ; @@ -124,7 +121,6 @@ class AdminDetails extends React.Component {
)} -
diff --git a/scm-webapp/src/main/java/sonia/scm/admin/ReleaseVersionChecker.java b/scm-webapp/src/main/java/sonia/scm/admin/ReleaseVersionChecker.java index b83e590c5b..345a351946 100644 --- a/scm-webapp/src/main/java/sonia/scm/admin/ReleaseVersionChecker.java +++ b/scm-webapp/src/main/java/sonia/scm/admin/ReleaseVersionChecker.java @@ -77,13 +77,13 @@ public class ReleaseVersionChecker { cache.put("latest", latestRelease.get()); return latestRelease; } + LOG.info("No newer version found for SCM-Manager"); + return Optional.empty(); } catch (IOException e) { - // This is an silent action. We don't want the user to get any kind of error for this. + // This is a silent action. We don't want the user to get any kind of error for this. LOG.info("No newer version found for SCM-Manager"); return Optional.empty(); } - LOG.info("No newer version found for SCM-Manager"); - return Optional.empty(); } private boolean isNewerVersion(ReleaseInfo releaseInfo) {