* Tue Apr 30 2024 Brian Read <brianr@koozali.org> 11.0.0-7.sme

- Remove use of hel command and replace by call to BlockDevices lib [SME: 12644]

root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm

@@ -37,6 +37,8 @@ use esmith::BackupHistoryDB;
 use esmith::util;
 use esmith::lockfile;
 
+use esmith::BlockDevices;
+
 use constant DEBUG => $ENV{MOJO_SMANAGER_DEBUG} || 0;
 
 our $cdb = esmith::ConfigDB->open || die "Couldn't open config db";
@@ -1576,19 +1578,33 @@ sub get_BackupwkDest_options {
     my @usbdisks = ();
 
     if ( $VFSType eq 'usb' ) {
-        foreach my $udi (qx(hal-find-by-property --key volume.fsusage --string filesystem)) {
-            $udi =~ m/^(\S+)/;
+        my $devices = esmith::BlockDevices->new ('allowmount' => 'disabled');
+        my ($valid, $invalid) = $devices->checkBackupDrives(0);
 
-            my $is_mounted = qx(hal-get-property --udi $1 --key volume.is_mounted);
-
-            if ($is_mounted eq "false\n") {
-                my $vollbl = qx(hal-get-property --udi $1 --key volume.label);
-                $vollbl =~ m/^(\S+)/;
-                if ($vollbl =~ /^\s/) {$vollbl = 'nolabel';}
-                chomp $vollbl;
-                push @usbdisks, $vollbl;
+        if ( ${$valid}[0] ) {
+            foreach ( @{$valid} ) {
+                push @usbdisks, $devices->label($_);
             }
         }
+ 
+        if (!$usbdisks[0]){
+			 push (@usbdisks,$c->l('bac_No suitable local devices found'));
+		}
+        $devices->destroy;
+
+         #foreach my $udi (qx(hal-find-by-property --key volume.fsusage --string filesystem)) {
+            #$udi =~ m/^(\S+)/;
+
+            #my $is_mounted = qx(hal-get-property --udi $1 --key volume.is_mounted);
+
+            #if ($is_mounted eq "false\n") {
+                #my $vollbl = qx(hal-get-property --udi $1 --key volume.label);
+                #$vollbl =~ m/^(\S+)/;
+                #if ($vollbl =~ /^\s/) {$vollbl = 'nolabel';}
+                #chomp $vollbl;
+                #push @usbdisks, $vollbl;
+            #}
+        #}
     #    return undef unless ($usbdisks[0]);
     }
 
@@ -1985,31 +2001,50 @@ sub dmount {
 	return ( qx(/bin/mount -t nfs -o nolock "$host:/$share" $mountdir 2>&1) );
     } 
     elsif ($VFSType eq 'usb') {
-        my $device = "";
-        my $blkdev = "";
+         my $device = "";
         my $vollbl = "";
-        foreach my $udi (qx(hal-find-by-property --key volume.fsusage --string filesystem)) {
-          $udi =~ m/^(\S+)/;
-          my $is_mounted = qx(hal-get-property --udi $1 --key volume.is_mounted);
 
-          if ($is_mounted eq "false\n") {
-              $blkdev = qx(hal-get-property --udi $1 --key block.device);
-              if ($blkdev =~ m/^(\S+)/) {$blkdev = $1;}
-          }
-          if ($is_mounted eq "false\n") {
-              $vollbl = qx(hal-get-property --udi $1 --key volume.label);
-              $vollbl =~ m/^(\S+)/;
-              if ($vollbl =~ /^\s/) {$vollbl = 'nolabel';}
-          }
+        my $devices = esmith::BlockDevices->new ('allowmount' => 'disabled');
+        my ($valid, $invalid) = $devices->checkBackupDrives(0);
 
-          chomp $vollbl;
-          chomp $blkdev;
-          $vollbl = "media/$vollbl";
-          if  ($vollbl eq $share) {
-            $device = $blkdev;
-          } 
+        if ( ${$valid}[0] ) {
+            foreach ( @{$valid} ) {
+                $vollbl = $devices->label($_);
+                if ( $share eq "media/$vollbl" ) {
+                    $device = "/dev/$_";
+                }
+            }
         }
-        return ( qx(/bin/mount $device "/$share" 2>&1) );
+        $devices->destroy;
+        return ( qx (mount $device /$share 2>&1) );
+ 
+#-------------------------------------------------------------------------------------------------------
+        #my $device = "";
+        #my $blkdev = "";
+        #my $vollbl = "";
+        #foreach my $udi (qx(hal-find-by-property --key volume.fsusage --string filesystem)) {
+          #$udi =~ m/^(\S+)/;
+          #my $is_mounted = qx(hal-get-property --udi $1 --key volume.is_mounted);
+
+          #if ($is_mounted eq "false\n") {
+              #$blkdev = qx(hal-get-property --udi $1 --key block.device);
+              #if ($blkdev =~ m/^(\S+)/) {$blkdev = $1;}
+          #}
+          #if ($is_mounted eq "false\n") {
+              #$vollbl = qx(hal-get-property --udi $1 --key volume.label);
+              #$vollbl =~ m/^(\S+)/;
+              #if ($vollbl =~ /^\s/) {$vollbl = 'nolabel';}
+          #}
+
+          #chomp $vollbl;
+          #chomp $blkdev;
+          #$vollbl = "media/$vollbl";
+          #if  ($vollbl eq $share) {
+            #$device = $blkdev;
+          #} 
+        #}
+         #return ( qx(/bin/mount $device "/$share" 2>&1) );
+#-------------------------------------------------------------------------------------------------------
     } else {
 	return ("Error while mounting $host/$share : $VFSType not supported.\n");
     }

root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Backup/backup_en.lex

@@ -1,3 +1,4 @@
+'bac_No suitable local devices found' => 'No suitable local devices found',
 'bac_BACKUP_TITLE' => 'Backup or restore server data',
 'bac_BACKUP_DESC' => '<P>The server provides two ways to back up and restore
 your server: using your local desktop or a tape drive.</P>

root/usr/share/smanager/themes/default/templates/layouts/default.html.ep

@@ -19,16 +19,18 @@
     %= content_for 'refresh'
     
     %= stylesheet '/js/datatables.min.css'
+
 	%= javascript '/js/datatables.min.js'
+
 	%= stylesheet '/js/jquery-ui.min.css'
+
 	%= javascript '/js/jquery-ui.min.js'
-	
-	%= stylesheet '/js/dataTables.buttons.min.js'
-	%= stylesheet '/js/jszip.min.js'
-	%= stylesheet '/js/pdfmake.min.js'
-	%= stylesheet '/js/vfs_fonts.js'
-	%= stylesheet '/js/buttons.html5.min.js'
-	%= stylesheet '/js/buttons.print.min.js'
+	%= javascript '/js/dataTables.buttons.min.js'
+	%= javascript '/js/jszip.min.js'
+	%= javascript '/js/pdfmake.min.js'
+	%= javascript '/js/vfs_fonts.js'
+	%= javascript '/js/buttons.html5.min.js'
+	%= javascript '/js/buttons.print.min.js'
 
 	%= stylesheet '/css/sme-jquery-overrides.css'
 
@@ -90,47 +92,6 @@
     % }
 
 %= javascript '/js/sme-dataTable-setup.js'
-
-%= javascript begin
-//Set menu to initial condition based on localStorage
-$(document).ready(function() {
-	let menunavflag = window.localStorage.getItem('menunav');
-	if (menunavflag != "false"){
-		$('#menunav').toggle(true);	
-	} else {
-		$('#menunav').toggle(false);	      
-	}
-	
-	let menuadmflag = window.localStorage.getItem('menuadm');
-	if (menuadmflag != "false"){
-		$('#menuadm').toggle(true);	
-	} else {
-		$('#menuadm').toggle(false);	      
-	}
-
-	let menuuserflag = window.localStorage.getItem('menuuser');
-	if (menuuserflag != "false"){
-		$('#menuuser').toggle(true);	
-	} else {
-		$('#menuuser').toggle(false);	      
-	}
-	
-	var sections = document.getElementsByClassName("section-title");
-	for (var i = 0, len = sections.length; i < len; i++) {
-		var jqObj = $(sections[i]);
-		var $section = jqObj.parent().next('div');
-		if(!$section.length){
-			return false;
-		}
-		let localStorageTag = "admSection-"+sections[i].innerHTML;
-		if (window.localStorage.getItem(localStorageTag) != "false"){
-			$section.toggle(true);
-		} else {
-			$section.toggle(false);	      
-		}
-	}
-})
-%end
   
 </body>
 </html>

root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep

@@ -9,6 +9,7 @@
 	<br>
 	%= submit_button "$btn", class => 'action'
 	</p>
+    %= hidden_field 'trt' => 'ADD';
 
     % end    
 
@@ -71,9 +72,7 @@
     %    }
     	</tbody>
     	</table>
-
 	<%} %>
 
-        %= hidden_field 'trt' => $iba_datas->{trt}
 
 </div>

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 4
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -108,6 +108,15 @@ true
 %defattr(-,root,root)
 
 %changelog
+* Tue Apr 30 2024 Brian Read <brianr@koozali.org> 11.0.0-7.sme
+- Remove use of hel command and replace by call to BlockDevices lib [SME: 12644]
+
+* Mon Apr 29 2024 Brian Read <brianr@koozali.org> 11.0.0-6.sme
+- Update layout for table extras [SME: 12656]
+
+* Sun Apr 28 2024 Brian Read <brianr@koozali.org> 11.0.0-5.sme
+- Ibay create not getting into panel [SME: 12652]
+
 * Tue Apr 23 2024 Brian Read <brianr@koozali.org> 11.0.0-4.sme
 - add in Nav numbers for Legacypanels.pm and ignore it when generating nav menu [SME:12643]