[TWiki-Dev] [SVN] PeterThoeny r21909 - twiki/trunk/BackupRestorePlugin/lib/TWiki/Plugins/BackupRestorePlugin

[<de...@de...>]

Author: PeterThoeny
Date: 2011-08-07 00:46:01 -0500 (Sun, 07 Aug 2011)
New Revision: 21909
Trac url: http://develop.twiki.org/trac/changeset/21909

Modified:
   twiki/trunk/BackupRestorePlugin/lib/TWiki/Plugins/BackupRestorePlugin/Core.pm
Log:
Item6631: Backup & Restore Utility - UI to cancel a backup process

Modified: twiki/trunk/BackupRestorePlugin/lib/TWiki/Plugins/BackupRestorePlugin/Core.pm
===================================================================
--- twiki/trunk/BackupRestorePlugin/lib/TWiki/Plugins/BackupRestorePlugin/Core.pm	2011-08-07 05:30:30 UTC (rev 21908)
+++ twiki/trunk/BackupRestorePlugin/lib/TWiki/Plugins/BackupRestorePlugin/Core.pm	2011-08-07 05:46:01 UTC (rev 21909)
@@ -78,6 +78,9 @@
         } elsif( $action eq 'create_backup' ) {
             $this->_startBackup( $session, $params );
             $text .= $this->_showBackupSummary( $session, $params );
+        } elsif( $action eq 'cancel_backup' ) {
+            $this->_cancelBackup( $session, $params );
+            $text .= $this->_showBackupSummary( $session, $params );
         } elsif( $action eq 'delete_backup' ) {
             $this->_deleteBackup( $session, $params );
             $text .= $this->_showBackupSummary( $session, $params );
@@ -105,28 +108,32 @@
     my $text = "| *Backup* | *Action* |\n";
     my( $inProgress, $fileName ) = $this->_checkBackupState();
     if( $inProgress ) {
-        $text .= "| \%ICON{zip}\% $fileName | \%ICON{processing}\% Creating backup, please wait. |\n";
+        $text .= '| %ICON{zip}% ' . $fileName . '| %ICON{processing}% Creating backup, please wait. '
+               . '<form action="%SCRIPTURL{view}%/%WEB%/%TOPIC%">'
+               . '<input type="hidden" name="action" value="cancel_backup" />'
+               . '<input type="submit" value="Cancel" class="twikiButton" />'
+               . '</form> |' . "\n";
     } else {
-        $text .= "| \%ICON{zip}\% $fileName "
+        $text .= '| %ICON{zip}% ' . $fileName
                . '| <form action="%SCRIPTURL{view}%/%WEB%/%TOPIC%">'
                . '<input type="hidden" name="action" value="create_backup" />'
                . '<input type="submit" value="Create backup now" class="twikiButton" />'
-               . "</form> |\n"; 
-
+               . '</form> |' . "\n";
     }
     my @backupFiles = $this->_listAllBackups();
     if( scalar @backupFiles ) {
-        foreach $fileName ( @backupFiles ) {
-            $text .= "| \%ICON{zip}\% [[\%SCRIPTURL{view}\%/\%WEB\%/\%TOPIC\%/$fileName][$fileName]] "
+        foreach $fileName ( reverse sort @backupFiles ) {
+            $text .= '| %ICON{zip}% [[%SCRIPTURL{view}%/%WEB%/%TOPIC%/' . "$fileName][$fileName]] "
                    . '| <form action="%SCRIPTURL{view}%/%WEB%/%TOPIC%">'
                    . '<input type="hidden" name="action" value="backup_detail" />'
                    . '<input type="hidden" name="file" value="' . $fileName . '" />'
                    . '<input type="submit" value="Details / Restore..." class="twikiButton" />'
-                   . "</form> "
+                   . '</form> '
                    . '<form action="%SCRIPTURL{view}%/%WEB%/%TOPIC%">'
                    . '<input type="hidden" name="action" value="delete_backup" />'
+                   . '<input type="hidden" name="file" value="' . $fileName . '" />'
                    . '<input type="submit" value="Delete..." class="twikiButton" />'
-                   . "</form> |\n";     
+                   . '</form> |' . "\n";
         }
     } else {
         $text .= "| (no existing backups ) | |\n";
@@ -165,6 +172,12 @@
 }
 
 #==================================================================
+sub _cancelBackup {
+    my( $this, $session, $params ) = @_;
+
+}
+
+#==================================================================
 sub _deleteBackup {
     my( $this, $session, $params ) = @_;