Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-08 22:45:45 +01:00
Code Issues Packages Projects Releases Activity

Heed review comments

Browse Source
This commit is contained in:
René Pfeuffer
2020-11-12 13:55:01 +01:00
parent f8219305a3
commit 08a2cca06d
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-core/src/main/java/sonia/scm/ExceptionWithContext.java
View File

@@ -37,21 +37,21 @@ public abstract class ExceptionWithContext extends RuntimeException {
private final List<ContextEntry> context; private final List<ContextEntry> context;
private final List<AdditionalMessage> additionalMessages; private final List<AdditionalMessage> additionalMessages;
public ExceptionWithContext(List<ContextEntry> context, String message) { protected ExceptionWithContext(List<ContextEntry> context, String message) {
this(context, null, message); this(context, null, message);
} }
public ExceptionWithContext(List<ContextEntry> context, List<AdditionalMessage> additionalMessages, String message) { protected ExceptionWithContext(List<ContextEntry> context, List<AdditionalMessage> additionalMessages, String message) {
super(message); super(message);
this.context = context; this.context = context;
this.additionalMessages = additionalMessages; this.additionalMessages = additionalMessages;
} }
public ExceptionWithContext(List<ContextEntry> context, String message, Exception cause) { protected ExceptionWithContext(List<ContextEntry> context, String message, Exception cause) {
this(context, null, message, cause); this(context, null, message, cause);
} }
public ExceptionWithContext(List<ContextEntry> context, List<AdditionalMessage> additionalMessages, String message, Exception cause) { protected ExceptionWithContext(List<ContextEntry> context, List<AdditionalMessage> additionalMessages, String message, Exception cause) {
super(message, cause); super(message, cause);
this.context = context; this.context = context;
this.additionalMessages = additionalMessages; this.additionalMessages = additionalMessages;

8
scm-ui/ui-components/src/BackendErrorNotification.tsx
View File

@@ -75,9 +75,11 @@ class BackendErrorNotification extends React.Component<Props> {
<> <>
<hr /> <hr />
{error.additionalMessages {error.additionalMessages
.map(a => (a.key ? t(`errors.${a.key}.description`) : a.message)) .map(additionalMessage =>
.map(m => ( additionalMessage.key ? t(`errors.${additionalMessage.key}.description`) : additionalMessage.message
<p>{m}</p> )
.map(message => (
<p>{message}</p>
))} ))}
<hr /> <hr />
</> </>