From aad1a458f45dc7eed0e9df5778eb561fa171a138 Mon Sep 17 00:00:00 2001
From: Brian Read
Date: Wed, 26 Mar 2025 08:58:32 +0000
Subject: [PATCH] * Wed Mar 26 2025 Brian Read
11.0.0-74.sme - Fix error message and success message format in Local
Networking panel [SME: 12969]
---
.../default/templates/partials/_ln_add.html.ep | 12 ++++++------
.../default/templates/partials/_ln_list.html.ep | 8 +++++---
smeserver-manager.spec | 5 ++++-
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/root/usr/share/smanager/themes/default/templates/partials/_ln_add.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_ln_add.html.ep
index 7722c58..60d1ea4 100644
--- a/root/usr/share/smanager/themes/default/templates/partials/_ln_add.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_ln_add.html.ep
@@ -13,17 +13,18 @@
% my $var5 = @vars[4];
% my $var6 = @vars[5];
+
%if ($ret{'ret'} eq "") {
%} elsif (index($ret{ret},"SUCCESS") != -1) {
-
Operation Status Report
- %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
+
+ %= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6));
%} else {
-
Operation Status Report - Error
- %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
+
+ %= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6));
%}
@@ -66,5 +67,4 @@
%end
-
-
+
\ No newline at end of file
diff --git a/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep b/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep
index 2541d33..e311df9 100644
--- a/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep
+++ b/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep
@@ -26,13 +26,15 @@
%if ($ret{ret} eq "") {
%=l "ln_FIRSTPAGE_DESC"
%} elsif (index($ret{ret},"SUCCESS") != -1) {
+
-
Operation Status Report
+
%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
%} else {
+
-
Operation Status Report - Error
+
%= $c->render_to_string(inline => l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6,$var7));
%}
@@ -103,4 +105,4 @@
%= hidden_field 'trt' => $ln_datas->{trt}
%}
-
+
\ No newline at end of file
diff --git a/smeserver-manager.spec b/smeserver-manager.spec
index 5856c97..4c0d73c 100644
--- a/smeserver-manager.spec
+++ b/smeserver-manager.spec
@@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2
%define name smeserver-manager
Name: %{name}
%define version 11.0.0
-%define release 73
+%define release 74
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@@ -143,6 +143,9 @@ true
%defattr(-,root,root)
%changelog
+* Wed Mar 26 2025 Brian Read 11.0.0-74.sme
+- Fix error message and success message format in Local Networking panel [SME: 12969]
+
* Tue Mar 25 2025 Brian Read 11.0.0-73.sme
- Some changes to error message format in css.
- Fix DB Cache problem with port forwarding panel [SME: 12970]