smeserver/smeserver-manager
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Tue Mar 25 2025 Brian Read <brianr@koozali.org> 11.0.0-73.sme

Browse Source 
- Some changes to error message format in css.
- Fix DB Cache problem with port forwarding panel [SME: 12970]
- Fix error and success message display for port forwarding panel [SME: 12969]
This commit is contained in:
Brian Read 2025-03-25 15:05:34 +00:00
parent ebbe7af9a7
commit 252bf20410
6 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm
View File

@ -142,6 +142,10 @@ sub do_display {
if ($trt eq 'LIST') { if ($trt eq 'LIST') {
#List all the port forwards #List all the port forwards
# Open them again as maybe written to above
$tcp_db = esmith::ConfigDB->open('portforward_tcp') || die "Can't open portforward_tcp database: $!\n";
$udp_db = esmith::ConfigDB->open('portforward_udp') || die "Can't open portforward_udp database: $!\n";
my @tcpforwards = $tcp_db->get_all; my @tcpforwards = $tcp_db->get_all;
my @udpforwards = $udp_db->get_all; my @udpforwards = $udp_db->get_all;
my $empty = 1 if not @tcpforwards and not @udpforwards; my $empty = 1 if not @tcpforwards and not @udpforwards;
@ -395,4 +399,4 @@ sub validate_allowed_hosts {
} ## end foreach (split(/[\s,]+/, $ahost...)) } ## end foreach (split(/[\s,]+/, $ahost...))
return %valid_ahost_list; return %valid_ahost_list;
} ## end sub validate_allowed_hosts } ## end sub validate_allowed_hosts
1; 1;

9
root/usr/share/smanager/themes/default/public/css/new-sme-main.css
View File

@ -201,11 +201,13 @@ body.menu {
div.error, div.sme-error, span.error, span.sme-error { div.error, div.sme-error, span.error, span.sme-error {
color: red; color: red;
background-color: #fff; background-color: #f9f9f9;
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
border-color: red; border-color: red;
padding: 2px; padding: 10px;
border-radius: 10px;
} }
form { form {
@ -493,5 +495,6 @@ div.success, span.success {
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
border-color: #006400 ; border-color: #006400 ;
padding: 8px; padding: 10px;
border-radius: 10px;
} }

2
root/usr/share/smanager/themes/default/public/css/new_sme.css
View File

@ -125,7 +125,7 @@
} }
#header2 { #header2 {
width: 94.2%; width:96%;
margin-left: 1px; margin-left: 1px;
margin-top: 4px; margin-top: 4px;
} }

7
root/usr/share/smanager/themes/default/templates/partials/_pf_add.html.ep
View File

@ -13,16 +13,17 @@
% my $var5 = @vars[4]; % my $var5 = @vars[4];
% my $var6 = @vars[5]; % my $var6 = @vars[5];
<br>
%if ($ret{'ret'} eq "") { %if ($ret{'ret'} eq "") {
%} elsif (index($ret{ret},"SUCCESS") != -1) { %} elsif (index($ret{ret},"SUCCESS") != -1) {
<div class='success'> <div class='success'>
<h2> Operation Status Report</h2> <!--<h2> Operation Status Report</h2>-->
%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
</div> </div>
%} else { %} else {
<div class='sme-error'> <div class='sme-error'>
<h2> Operation Status Report - Error</h2> <!--<h2> Operation Status Report - Error</h2>-->
%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
</div> </div>
%} %}
@ -84,4 +85,4 @@
%end %end
</div> </div>

8
root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep
View File

@ -21,13 +21,15 @@
%if ($ret{ret} eq "") { %if ($ret{ret} eq "") {
%= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION')); %= $c->render_to_string(inline => l('pf_FIRST_PAGE_DESCRIPTION'));
%} elsif (index($ret{ret},"SUCCESS") != -1) { %} elsif (index($ret{ret},"SUCCESS") != -1) {
<br>
<div class='success'> <div class='success'>
<h2> Operation Status Report</h2> <!--<h2> Operation Status Report</h2>-->
%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
</div> </div>
%} else { %} else {
<br>
<div class='sme-error'> <div class='sme-error'>
<h2> Operation Status Report - Error</h2> <!--<h2> Operation Status Report - Error</h2>-->
%= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6); %= $c->l($ret{ret},$var1,$var2,$var3,$var4,$var5,$var6);
</div> </div>
%} %}
@ -113,4 +115,4 @@
</table> </table>
%= hidden_field 'trt' => $pf_datas->{trt} %= hidden_field 'trt' => $pf_datas->{trt}
</div> </div>

7
smeserver-manager.spec
View File

@ -2,7 +2,7 @@ Summary: Sme server navigation module : manager 2
%define name smeserver-manager %define name smeserver-manager
Name: %{name} Name: %{name}
%define version 11.0.0 %define version 11.0.0
%define release 72 %define release 73
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
License: GPL License: GPL
@ -143,6 +143,11 @@ true
%defattr(-,root,root) %defattr(-,root,root)
%changelog %changelog
* Tue Mar 25 2025 Brian Read <brianr@koozali.org> 11.0.0-73.sme
- Some changes to error message format in css.
- Fix DB Cache problem with port forwarding panel [SME: 12970]
- Fix error and success message display for port forwarding panel [SME: 12969]
* Mon Mar 24 2025 Brian Read <brianr@koozali.org> 11.0.0-72.sme * Mon Mar 24 2025 Brian Read <brianr@koozali.org> 11.0.0-72.sme
- Remove css files from template structure [SME: 12967] - Remove css files from template structure [SME: 12967]
- Rationalise and merge css files - Rationalise and merge css files