Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix/#146-When-opening-the-gateway-overview-page,-there-is-an-Exception-evaluating-SpringEL-expression #147

Merged
merged 4 commits into from
Sep 20, 2021
Merged

Bugfix/#146-When-opening-the-gateway-overview-page,-there-is-an-Exception-evaluating-SpringEL-expression #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77436b2
added #messages on elvis operator inside of variable expression
BrunoSilvaATB Aug 30, 2021
fd87bf0
minor message text change: 'activity' instead of 'interaction'
gr-hovest-atb Aug 30, 2021
232412f
Added new lines to improve readability
BrunoSilvaATB Sep 2, 2021
7f4048e
Merge remote-tracking branch 'BrunoSilvaATBrepo/bugfix/#146-When-open…
BrunoSilvaATB Sep 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spring-boot/admin/src/main/resources/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ admin.dashboard.gatewayhealthmonitor.state.warning_critical=Problem(s) to be che
admin.dashboard.gatewayhealthmonitor.state.notconnected=One or more gateway(s) in unknown status.
admin.dashboard.gatewayhealthmonitor.state.ok=No problems found.
admin.dashboard.gatewayhealthmonitor.notification.switch=Monitoring
admin.dashboard.gatewayhealthmonitor.notconnectedgateway.text=No sign of interaction
admin.dashboard.gatewayhealthmonitor.notconnectedgateway.text=No sign of activity

# API keys management
admin.api-keys.page.title=API Keys
Expand Down
5 changes: 4 additions & 1 deletion spring-boot/admin/src/main/resources/templates/admin/fragments/proxies/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,10 @@ <h2 th:text="#{admin.proxies.list.title}">[Proxies Administration]</h2>
<td class="text-center "><a th:href="|@{/admin/proxies/}${proxy.id}|"
class="fa fa-bar-chart"/>
</td>
<td th:text="${proxy.timeOfLastSuccessfulCallToAdmin != null ? #dates.format(new java.util.Date(proxy?.timeOfLastSuccessfulCallToAdmin)) : #{admin.dashboard.gatewayhealthmonitor.notconnectedgateway}}"></td>
<td th:text="${proxy.timeOfLastSuccessfulCallToAdmin != null ?
#dates.format(new java.util.Date(proxy.timeOfLastSuccessfulCallToAdmin)) :
#messages.msg('admin.dashboard.gatewayhealthmonitor.notconnectedgateway.text')}">
</td>
<td class="right">
<button th:onclick="|@{location.href='/admin/proxies/}${proxy.id}@{/formUpdate'}|">
<i class="fa fa-pencil-square-o"/></button>
Expand Down