More sort routes

2024-04-28 12:03:06 +01:00
parent b96239639c
commit 26e9889061
15 changed files with 549 additions and 235 deletions
--- a/Targets/Nfsshare-Custom.pm
+++ b/Targets/Nfsshare-Custom.pm
@@ -2,13 +2,8 @@
 # Routines to be editted by the developer to provide validation for parameters
 # and provison of the control data for table(s)
 #
-# Generated by SM2Gen version:${version} 
+# Generated by SME2Gen version:0.6 Chameleon version:4.5.4 On Python:3.10.12  at 2024-04-27 10:35 
 #
-#$cdb=$main::cdb;
-#$adb=$main::adb;
-#$ndb=$main::ndb;
-#$hdb=$main::hdb;
-#$ddb=$main::ddb;

 use esmith::util;
 use esmith::HostsDB;
@@ -28,11 +23,13 @@ our $ddb = esmith::DomainsDB->open()  || die("Couldn't open Domains db");
 # Validation routines - parameters for each panel

 	sub validate_PARAMS {
+		$prefix_data = shift; #Data hash as parameter
 		$ret = 'ok';
 		return $ret;
 	}

 	sub validate_TABLE {
+		$prefix_data = shift; #Data hash as parameter
 		$ret = 'ok';
 		return $ret;
 	}
@@ -40,19 +37,70 @@ our $ddb = esmith::DomainsDB->open()  || die("Couldn't open Domains db");
 	
 # Get control data for tables(s)

-sub get_ibays {
-	my @res;
-	my @ibays = $adb->ibays();
-	foreach my $i (@ibays){
-		my %hash = ('Name'=> $i->prop('Name'),
-					'Description' => $i->prop('Description'),
-					'Flag' => 1,
-					'PARAMS' => 'Modify'
-					);
-		push(@res,\%hash);
+	sub get_ibays {
+		my $c = shift;
+		my @res;
+		my @ibays = $adb->ibays();
+		foreach my $i (@ibays){
+			# Taken pretty well verbatim from /usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/nfsshare.pm
+			# although the href is more specific to the SM2 structure.
+			my $ibayname = $i->key();
+			my $ibaydesc = $i->prop('Name');
+			my $ibaynfs  = $i->prop('NfsStatus')||'disabled';
+			my $modifiable = $i->prop('Modifiable') || 'yes';
+
+			$ibaynfs = $c->l('ENABLED') if ($ibaynfs eq 'enabled');
+			$ibaynfs = $c->l('DISABLED') if ($ibaynfs eq 'disabled');
+
+
+			#my $params = $self->build_ibay_cgi_params($ibayname, $i->props());
+			#my $scriptname = "nfsshareu";
+			#my $href = "$scriptname?$params&action=modify&wherenext=";
+
+			my $actionModify = '&nbsp;';
+			if ($modifiable eq 'yes'){
+				$actionModify .= "<a href='nfsshareu?trt=PARAMS&IbayName=$ibayname'><button class='sme-modify-button' title=".$c->l("MODIFY").">".$c->l("MODIFY")."</button></a>"."&nbsp"
+			}
+
+			my %hash = ('Name'=> $ibayname,
+						'Description' => $ibaydesc,
+						'Flag' => $ibaynfs,
+						'Modify' => $actionModify
+						);
+			push(@res,\%hash);
+		}
+		return \@res
 	}
-	return \@res
-}
+
+# Return hash with values from row in which link clicked on table
+
+	sub validate_get_selected_PARAMS {
+		$selected = shift; #Parameter is name of selected row.
+		%ret = {};
+		return $ret;
+	}
+
+	sub validate_get_selected_TABLE {
+		$selected = shift; #Parameter is name of selected row.
+		%ret = {};
+		return $ret;
+	}
+
+
+#after sucessful modify or create or whatever and submit then perfom (if the params validate)
+
+	sub perform_PARAMS {
+		$prefix_data = shift; #Data hash as parameter
+		$ret = 'ok';
+		return $ret;
+	}
+
+	sub perform_TABLE {
+		$prefix_data = shift; #Data hash as parameter
+		$ret = 'ok';
+		return $ret;
+	}
+

 1;

--- a/Targets/Nfsshare-Custom.pm.new
+++ b/Targets/Nfsshare-Custom.pm.new
@@ -2,11 +2,8 @@
 # Routines to be editted by the developer to provide validation for parameters
 # and provison of the control data for table(s)
 #
-#$cdb=$main::cdb;
-#$adb=$main::adb;
-#$ndb=$main::ndb;
-#$hdb=$main::hdb;
-#$ddb=$main::ddb;
+# Generated by SME2Gen version:0.6 Chameleon version:4.5.4 On Python:3.10.12  at 2024-04-28 11:53 
+#

 use esmith::util;
 use esmith::HostsDB;
@@ -26,11 +23,13 @@ our $ddb = esmith::DomainsDB->open()  || die("Couldn't open Domains db");
 # Validation routines - parameters for each panel

 	sub validate_PARAMS {
+		$prefix_data = shift; #Data hash as parameter
 		$ret = 'ok';
 		return $ret;
 	}

 	sub validate_TABLE {
+		$prefix_data = shift; #Data hash as parameter
 		$ret = 'ok';
 		return $ret;
 	}
@@ -38,9 +37,42 @@ our $ddb = esmith::DomainsDB->open()  || die("Couldn't open Domains db");
 	
 # Get control data for tables(s)

-sub get_ibays {
-  return []
-}
+	sub get_ibays {
+		my $c = shift;
+		@ret = {}
+		return \@ret
+	}
+
+
+# Return hash with values from row in which link clicked on table
+
+	sub validate_get_selected_PARAMS {
+		$selected = shift; #Parameter is name of selected row.
+		%ret = {};
+		return $ret;
+	}
+
+	sub validate_get_selected_TABLE {
+		$selected = shift; #Parameter is name of selected row.
+		%ret = {};
+		return $ret;
+	}
+
+
+#after sucessful modify or create or whatever and submit then perfom (if the params validate)
+
+	sub perform_PARAMS {
+		$prefix_data = shift; #Data hash as parameter
+		$ret = 'ok';
+		return $ret;
+	}
+
+	sub perform_TABLE {
+		$prefix_data = shift; #Data hash as parameter
+		$ret = 'ok';
+		return $ret;
+	}
+

 1;

--- a/Targets/Nfsshare.html.ep
+++ b/Targets/Nfsshare.html.ep
@@ -1,4 +1,7 @@
 % layout 'default', title => "Sme server 2 - NFS data share", share_dir => './';
+%#
+%# Generated by SME2Gen version:0.6 Chameleon version:4.5.4 On Python:3.10.12  at 2024-04-28 11:53 
+%#
 % content_for 'module' => begin
 <div id="module" class="module Nfsshare-panel">

--- a/Targets/Nfsshare.pm
+++ b/Targets/Nfsshare.pm
@@ -1,49 +1,25 @@
 package SrvMngr::Controller::Nfsshare;
-
+#
+# Generated by version:SME2Gen version:0.6 Chameleon version:4.5.4 On Python:3.10.12  at 2024-04-28 11:53 
+#
 #----------------------------------------------------------------------
 # heading     : Network
 # description : NFS data share
 # navigation  : 2000 400
 #
 # name : nfsshare,    method : get,   url : /nfsshare,   ctlact : nfsshare#main
-# name : nfsshared,   method : post,  url : /nfsshared,  ctlact : nfsshare#do_update
+# name : nfsshareu,   method : post,  url : /nfsshareu,  ctlact : nfsshare#do_update
+# name : nfsshared,   method : get,   url : /nfsshared,  ctlact : nfsshare#do_display
 #
 # routes : end
 #
-# Documentation: https://wiki.contribs.org/{PackageName}
+# Documentation: https://wiki.contribs.org/Nfsshare
 #----------------------------------------------------------------------

 #
 # Scheme of things:
 #
-#main:
-##
-## Initial entry
-##
-#set initial panel
-#for initial panel:
-#	load up _data hash with DB fields
-#	load up stash with pointer(s) to control fields hash(= get-))
-#render initial panel
-#
-#do_display
-##
-## Return after submit pushed on panel
-##
-#load up all params into local hash
-#	by panel:
-#		by param:
-#			validate param (return ret = ok or error message) - call validate-
-#			break out on error
-#if validation not ok
-#	render back to current panel with error message in stash
-#otherwise
-#	By panel:
-#		Copy back to DB any that have changed (how to easily tell if it has changed?)
-#		do whatever is required (inc signal_event smeserver-<whatever>-update?)
-#		set success
-#	call main?
-
+# TBA!!

 use strict;
 use warnings;
@@ -76,6 +52,16 @@ our $ddb = esmith::DomainsDB->open()  || die("Couldn't open Domains db");
 require '/usr/share/smanager/lib/SrvMngr/Controller/Nfsshare-Custom.pm';  #The code that is to be added by the developer

 sub main {
+#
+# Initial entry - route is "/<whatever>"
+#
+#set initial panel
+#for initial panel:
+	#Specifiy panel to enter
+	#load up _data hash with DB fields
+	#load up stash with pointer(s) to control fields hash(= get-))
+		#and a pointer to the prefix_data hash
+#render initial panel

    my $c = shift;
    $c->app->log->info( $c->log_req );
@@ -87,12 +73,12 @@ sub main {
    $nfs_data{'trt'} = 'TABLE';
    
    #Load any DB entries into the <prefix>_data area so as they are preset in the form
-    # which DB
+    # which DB - this only really works if the initial panel is a PARAMS type panel and not a TABLE
    my $db = $cdb; #pickup local or global db or Default to config
    

 	# and table control fields
-    	$c->stash(ibays=>get_ibays());
+    	$c->stash(ibays=>get_ibays($c));
 	
 	
    $c->stash(
@@ -103,7 +89,32 @@ sub main {
    $c->render( template => "Nfsshare" );
 }

+# Post request with params - submit from a form
 sub do_update {
+#
+# Return after submit pushed on panel (this is a post) - route is "/<whatever>u"
+# parameters in the params hash.
+#
+#load up all params into prefix_data hash:
+#By panel (series of if statements - only one executed):
+		#call validate-PANEL() - return ret = ok or error message
+			
+#if validation not ok:
+	#render back to current panel with error message in stash
+#otherwise:
+	#By panel (series of if statements - only one executed):
+		#do whatever is required: call perform-PANEL() - return "ok" or Error Message
+			#call signal-event for any global actions specified (check it exists - error and continue?)
+			#if action smeserver-<whatever>-update exists
+				#signal_event smeserver-<whatever>-update
+			#call signal-event for any specific actions for thids panel (check it exists first - error and continue)
+		#set success in stash
+		#if no "nextpanel" entry:
+			#set firstpanel
+		#else 
+			#set nextpanel
+		#call render
+	
    my $c = shift;
    $c->app->log->info($c->log_req);
    
@@ -116,49 +127,137 @@ sub do_update {
    # Get number of POST parameters
    my $num_params = keys %params;
    
-    #Params are available in the hash "params"
-    # you may use:
-    my @result;
-    foreach my $key (keys %params) {
-        my $value = $params{$key};
-		push @result, { $key => $value };
-        $c->app->log->debug("$key: $value");
+    #Params are available in the hash "params" - copy to the prefix_data hash
+    while (my ($key, $value) = each %{$c->req->params->to_hash}) {
+        $nfs_data{$key} = $value;
    }

    # the value of trt will tell you which panel has returned    
-    my $trt = $c->param('trt') || 'TABLE' ; #hidden control on every form.
+    my $trt = $c->param('trt') || 'TABLE'; #hidden control on every form.
    my $ret = 'ok';
-    #Validate the parameters accordingly
+    #Validate the parameters in a custom sub one for each panel (although only one of these will be executed)
+
    my $thispanel;
    
 		if ($trt eq 'PARAMS'){
 			#Validate form parameters for panel PARAMS
-			$ret = validate_PARAMS();
+			$ret = validate_PARAMS(\%nfs_data);
 			$thispanel = 'PARAMS';
 		}
 	
 		if ($trt eq 'TABLE'){
 			#Validate form parameters for panel TABLE
-			$ret = validate_TABLE();
+			$ret = validate_TABLE(\%nfs_data);
 			$thispanel = 'TABLE';
 		}
 	
-	if ($ret eq "ok") {
+	
+	if ($ret ne "ok") {
+        # return to the panel with error message
+		$c->stash(error => $c->l($ret));
+		$c->render("Nfsshare");		
+	} else {
 		#Do whatever is needed, including writing values to the DB
-		my $db = $cdb; #pickup local or global db or Default to config
 		
-		# anything else here...
-		$c->stash( success => $c->l("$thispanel successfull message"));
+			if ($trt eq 'PARAMS'){
+				#do whatever is required ...
+				$ret = perform_PARAMS(\%nfs_data);
+				if ($ret ne "ok") {
+					# return to the panel with error message
+					$c->stash(error => $c->l($ret));
+					$c->render("Nfsshare");		
+				} else {
+					$c->stash( success => $c->l("PARAMS panel action was successfull")); #A bit bland - edit it in the lex file
+				}
+			}
+		
+			if ($trt eq 'TABLE'){
+				#do whatever is required ...
+				$ret = perform_TABLE(\%nfs_data);
+				if ($ret ne "ok") {
+					# return to the panel with error message
+					$c->stash(error => $c->l($ret));
+					$c->render("Nfsshare");		
+				} else {
+					$c->stash( success => $c->l("TABLE panel action was successfull")); #A bit bland - edit it in the lex file
+				}
+			}
+		
+		# and call any signal-events needed
+		
+		
+		# Setup shared data and call panel
 		$c->stash( 
 			title 			=> $title, 
 			nfs_data  => \%nfs_data
-			# Extra data in here - repeat for each stash data entry needed for panels
 		);
-		nfs_data{'trt'} = 'TABLE';
+		if ('none' eq 'none') {
+			$nfs_data{'trt'} = 'TABLE';
+		} else {
+			$nfs_data{'trt'} = 'none';
+		}	
 		$c->render("Nfsshare");
-	}	
+	} 
 }

+sub do_display {
+#
+# Return after link clicked in table (this is a get) - route is "/<whatever>d"
+# Expects ?trt=PANEL&selected="TableRowName" plus any other required
+#
+#load up all supplied params into prefix_data hash
+#call get-selected-PANEL() - returns hash of all relevent parameters
+#load up returned hash into prefix_data
+#render - to called panel
+
+    my $c = shift;
+    $c->app->log->info($c->log_req);
+    
+    my %nfs_data = ();
+    my $title = $c->l("nfs_NFS data share");
+
+	# Accessing all POST parameters
+    my %params = $c->req->params->to_hash;
+
+    # Get number of POST parameters
+    my $num_params = keys %params;
+    
+    #Params are available in the hash "params" - copy to the prefix_data hash
+    while (my ($key, $value) = each %{$c->req->params->to_hash}) {
+        $nfs_data{$key} = $value;
+    }
+
+    # the value of trt will tell you which panel has returned    
+    my $trt = $c->param('trt') || 'TABLE'; #Indicates where to go now
+ 
+    # Now add in the params from the selected row from the table
+    my %selectedrow;
+    
+		if ($trt eq 'PARAMS'){
+			#Validate form parameters for panel PARAMS
+			%selectedrow = selected_PARAMS($nfs_data{'Selected'});
+		}
+	
+		if ($trt eq 'TABLE'){
+			#Validate form parameters for panel TABLE
+			%selectedrow = selected_TABLE($nfs_data{'Selected'});
+		}
+	
+ 
+	#Copy in the selected row params to the prefix_data hash to pass to the panel
+	while (my ($key, $value) = each %selectedrow){
+        $nfs_data{$key} = $value;
+    }
+	# Where to go now
+	$nfs_data{'trt'} = $trt;
+	
+	# Data for panel
+	$c->stash( 
+		title 			=> $title, 
+		nfs_data  => \%nfs_data
+	);
+	$c->render("Nfsshare");
+}    
 1;


--- a/Targets/_nfs_PARAMS.html.ep
+++ b/Targets/_nfs_PARAMS.html.ep
@@ -1,3 +1,6 @@
+%#
+%# Generated by SME2Gen version:0.6 Chameleon version:4.5.4 On Python:3.10.12  at 2024-04-28 11:53 
+%#
 <div id="Nfsshare-PARAMS">
  <script>
    window.onload = function() {
@@ -13,7 +16,9 @@
   	    % param 'trt' => $nfs_data->{trt} unless param 'trt';
 		%= hidden_field 'trt' => $nfs_data->{trt}
 		%# Inputs etc in here.
-<h2>Manage NFS Ibay settings:</h2>
+
+		<h2>Manage NFS Ibay settings:</h2>
+	
 		<p>
 			%= l('nfs_These parameters will be effective only if the share is enabled. The share is in /home/e-smith/files/ibays//files')
 		</p>
--- a/Targets/_nfs_TABLE.html.ep
+++ b/Targets/_nfs_TABLE.html.ep
@@ -1,3 +1,6 @@
+%#
+%# Generated by SME2Gen version:0.6 Chameleon version:4.5.4 On Python:3.10.12  at 2024-04-28 11:53 
+%#
 <div id="Nfsshare-TABLE">
  <script>
    window.onload = function() {
@@ -13,8 +16,10 @@
   	    % param 'trt' => $nfs_data->{trt} unless param 'trt';
 		%= hidden_field 'trt' => $nfs_data->{trt}
 		%# Inputs etc in here.
-<h2>Manage NFS Ibay settings:</h2>
-		<table class="sme-border TableSort">
+
+		<h2>Manage NFS Ibay settings:</h2>
+	
+		<br /><table class="sme-border TableSort">
 			<thead>
 				<tr>
 					<th class='sme-border'>Name</th>
@@ -27,10 +32,10 @@
 				% my $control_data = $self->stash('ibays');
 				% foreach my $row (@$control_data) {
 				<tr>
-					<td class='sme-border'><%=$row->{Name}%></td>
-					<td class='sme-border'><%=$row->{Description}%></td>
-					<td class='sme-border'><%=$row->{flag}%></td>
-					<td class='sme-border'><%=$row->{PARAMS}%></td>		
+					<td class='sme-border'><%=$c->render_to_string(inline=>$row->{Name})%></td>
+					<td class='sme-border'><%=$c->render_to_string(inline=>$row->{Description})%></td>
+					<td class='sme-border'><%=$c->render_to_string(inline=>$row->{flag})%></td>
+					<td class='sme-border'><%=$c->render_to_string(inline=>$row->{Modify})%></td>		
 				</tr>
 				%}
 			</tbody>
--- a/Targets/nfsshare_en.lex
+++ b/Targets/nfsshare_en.lex
@@ -1,22 +1,23 @@
-'nfs_Delays the disk writing' => 'Delays the disk writing'
-'nfs_Save' => 'Save'
-'nfs_Set the uid and gid if you want all requests appear to be from one user or one group, otherwise leave blank' => 'Set the uid and gid if you want all requests appear to be from one user or one group, otherwise leave blank'
-'nfs_NFS data share' => 'NFS data share'
-'nfs_$thispanel successfull message' => '$thispanel successfull message'
-'nfs Hello TABLE' => 'Hello TABLE'
-'nfs_For writing permissions,allowing the root user and using insecure ports, you must configure a list of one IP per line, being part of the local network(s).' => 'For writing permissions,allowing the root user and using insecure ports, you must configure a list of one IP per line, being part of the local network(s).'
-'nfs_Write (a)synchronously' => 'Write (a)synchronously'
-'nfs_Share owner Group' => 'Share owner Group'
-'nfs_File system permissions' => 'File system permissions'
-'nfs_EnableShare on local network' => 'EnableShare on local network'
-'nfs_Squash the power of users' => 'Squash the power of users'
-'nfs_Set the GID.' => 'Set the GID.'
-'nfs_These parameters will be effective only if the share is enabled. The share is in /home/e-smith/files/ibays//files' => 'These parameters will be effective only if the share is enabled. The share is in /home/e-smith/files/ibays//files'
-'nfs_Enable the NFS Share' => 'Enable the NFS Share'
-'nfs_APPLY' => 'APPLY'
 'nfs_Requests on secure ports' => 'Requests on secure ports'
+'nfs_APPLY' => 'APPLY'
+'nfs_EnableShare on local network' => 'EnableShare on local network'
+'nfs_Set the GID.' => 'Set the GID.'
+'nfs_Save' => 'Save'
+'nfs_Share owner Group' => 'Share owner Group'
 'nfs_Browse the parent folders' => 'Browse the parent folders'
+'nfs Hello TABLE' => 'Hello TABLE'
+'nfs_File system permissions' => 'File system permissions'
+'nfs_Delays the disk writing' => 'Delays the disk writing'
+'nfs_NFS data share' => 'NFS data share'
+'nfs_Set the UID.' => 'Set the UID.'
 'nfs_NFS Client(s) allowed' => 'NFS Client(s) allowed'
+'nfs_TABLE panel action was successfull' => 'TABLE panel action was successfull'
+'nfs_For writing permissions,allowing the root user and using insecure ports, you must configure a list of one IP per line, being part of the local network(s).' => 'For writing permissions,allowing the root user and using insecure ports, you must configure a list of one IP per line, being part of the local network(s).'
+'nfs_These parameters will be effective only if the share is enabled. The share is in /home/e-smith/files/ibays//files' => 'These parameters will be effective only if the share is enabled. The share is in /home/e-smith/files/ibays//files'
+'nfs_Write (a)synchronously' => 'Write (a)synchronously'
+'nfs_Squash the power of users' => 'Squash the power of users'
+'nfs_Set the uid and gid if you want all requests appear to be from one user or one group, otherwise leave blank' => 'Set the uid and gid if you want all requests appear to be from one user or one group, otherwise leave blank'
+'nfs_Enable the NFS Share' => 'Enable the NFS Share'
+'nfs_PARAMS panel action was successfull' => 'PARAMS panel action was successfull'
 'nfs Hello PARAMS' => 'Hello PARAMS'
 'nfs_Information Bay name' => 'Information Bay name'
-'nfs_Set the UID.' => 'Set the UID.'