[vhffs-dev] [1936] fixed object deletion, users are now able to delete objects back :-)

[subversion@xxxxxxxxxxxxx]

Revision: 1936
Author:   gradator
Date:     2012-01-24 21:51:14 +0100 (Tue, 24 Jan 2012)
Log Message:
-----------
fixed object deletion, users are now able to delete objects back :-)

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Panel/User.pm
    trunk/vhffs-panel/templates/object/delete.tt

Modified: trunk/vhffs-api/src/Vhffs/Panel/User.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/User.pm	2012-01-24 20:19:25 UTC (rev 1935)
+++ trunk/vhffs-api/src/Vhffs/Panel/User.pm	2012-01-24 20:51:14 UTC (rev 1936)
@@ -593,7 +593,8 @@
 					if( $userp->commit < 0 ) {
 						$message = gettext('An error occured while applying changes. This user will NOT be deleted');
 					} else {
-						$message = gettext('This user will BE DELETED');
+						$panel->render('misc/message.tt', { message => gettext('This user will BE DELETED'), refresh_url => '?do=login' });
+						return;
 					}
 				}
 			} else {
@@ -601,7 +602,7 @@
 			}
 		}
 
-		$panel->render('misc/message.tt', { message => $message, refresh_url => '?do=login' });
+		$panel->render('misc/message.tt', { message => $message });
 		return;
 	}
 

Modified: trunk/vhffs-panel/templates/object/delete.tt
===================================================================
--- trunk/vhffs-panel/templates/object/delete.tt	2012-01-24 20:19:25 UTC (rev 1935)
+++ trunk/vhffs-panel/templates/object/delete.tt	2012-01-24 20:51:14 UTC (rev 1936)
@@ -4,7 +4,7 @@
 %]
 <h2>[% 'Delete this object' | i18n | html %]</h2>
 
-<form method="post" action="#" accept-charset="utf-8">
+<form method="post" action="?do=objectdelete" accept-charset="utf-8">
 	<fieldset class="delete">
 		<legend>
 			[% 'Are you SURE you want to DELETE this object?' | i18n | html %]