[vhffs-dev] [1801] No more HTML::Template in pgsql/list

[subversion@xxxxxxxxxxxxx]

Revision: 1801
Author:   beuss
Date:     2011-05-24 07:53:49 +0200 (Tue, 24 May 2011)
Log Message:
-----------
No more HTML::Template in pgsql/list

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm
    trunk/vhffs-panel/admin/pgsql/list.pl
    trunk/vhffs-panel/templates/Makefile.am

Removed Paths:
-------------
    trunk/vhffs-panel/templates/admin/pgsql/part.tmpl

Modified: trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm	2011-05-24 05:53:41 UTC (rev 1800)
+++ trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm	2011-05-24 05:53:49 UTC (rev 1801)
@@ -49,29 +49,24 @@
 
 
 sub search {
-        my ($main, $name) = @_;
+    my ($main, $name) = @_;
 
-        my $sql;
-        my @params;
-        my $pgs = [];
+    my @params;
+    my $sql = 'SELECT p.dbname as label, g.groupname as owner_group, o.state, u.username as owner_user '.
+        'FROM vhffs_pgsql p '.
+        'INNER JOIN vhffs_object o ON (o.object_id = p.object_id) '.
+        'INNER JOIN vhffs_groups g ON (g.gid = o.owner_gid) '.
+        'INNER JOIN vhffs_users u ON (u.uid = o.owner_uid) ';
 
     if( defined $name ) {
-        $sql = 'SELECT p.dbname, g.groupname, o.state  FROM vhffs_pgsql p INNER JOIN vhffs_object o ON o.object_id = p.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid WHERE p.dbname LIKE ? OR p.dbuser LIKE ?';
+        $sql .= 'WHERE p.dbname LIKE ? ';
         push(@params, '%'.lc($name).'%', '%'.lc($name).'%');
-    } else {
-        $sql = 'SELECT p.dbname, g.groupname, o.state  FROM vhffs_pgsql p INNER JOIN vhffs_object o ON o.object_id = p.object_id INNER JOIN vhffs_groups g ON g.gid = o.owner_gid';
     }
 
-    my $dbh = $main->get_db_object();
-    my $sth = $dbh->prepare($sql) or return undef;
+    $sql .= 'ORDER BY label';
 
-    return undef unless( $sth->execute(@params) );
-
-    while(my $p = $sth->fetchrow_hashref('NAME_lc')) {
-        $p->{state} = Vhffs::Functions::status_string_from_status_id($p->{state});
-        push(@$pgs, $p);
-    }
-    return $pgs;
+    my $dbh = $main->get_db_object();
+    return $dbh->selectall_arrayref( $sql, { Slice => {} }, @params);
 }
 
 

Modified: trunk/vhffs-panel/admin/pgsql/list.pl
===================================================================
--- trunk/vhffs-panel/admin/pgsql/list.pl	2011-05-24 05:53:41 UTC (rev 1800)
+++ trunk/vhffs-panel/admin/pgsql/list.pl	2011-05-24 05:53:49 UTC (rev 1801)
@@ -32,65 +32,32 @@
 use strict;
 use utf8;
 use POSIX qw(locale_h);
-use HTML::Template;
 use locale;
 use Locale::gettext;
 use CGI;
 use CGI::Session;
 
 use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
-use Vhffs::Panel::Main;
+use Vhffs::Panel::Admin;
 use Vhffs::Panel::Pgsql;
 
-my $panel = new Vhffs::Panel::Main();
-exit 0 unless $panel;
-my $session = $panel->get_session;
-exit 0 unless $session;
+my $panel = new Vhffs::Panel::Admin();
 
 my $vhffs = $panel->{'vhffs'};
-my $user = $panel->{'user'};
 my $cgi = $panel->{'cgi'};
-my $templatedir = $panel->{'templatedir'};
-my $template;
+my $name = $cgi->param('NAME');
 
-if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
-{
-	$template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
-	$template->param( MESSAGE => gettext('You are not allowed to see it') );
-}
-else
-{
-	$template = new HTML::Template( filename => $templatedir.'/panel/admin/misc/list.tmpl' );
-	my $name = $cgi->param('NAME');
+my $vars = {
+    type => 'pgsql'
+};
 
-	if( defined( $name ) )
-	{
-		$template->param( TITLE => gettext('Search result for database').': '.$name );
-	}
-	else
-	{
-		$template->param( TITLE => gettext('List of all PostgreSQL databases') );
-	}
-
-	$template->param( TEXT_TITLE1 => gettext('DB Name') );
-	$template->param( TEXT_TITLE2 => gettext('Group') );
-	$template->param( TEXT_TITLE3 => gettext('State') );
-
-	my $dbs = Vhffs::Panel::Pgsql::search( $vhffs , $name );
-	if( defined $dbs )
-	{
-		my $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/pgsql/part.tmpl', global_vars => 1 );
-		if( $user->is_admin == 1 )  {
-			$subtemplate->param( ACTION => gettext('Modify') );
-		}  else  {
-			$subtemplate->param( ACTION => gettext('Show') );
-		}
-
-		$subtemplate->param( DBS => $dbs );
-		$template->param( LIST => $subtemplate->output );
+if( defined $name ) {
+    $vars->{list_title} = sprintf( gettext('Search result for database %s'), $name );
+} else {
+    $vars->{list_title} = gettext('List of all PostgreSQL databases');
 }
-}
 
-$panel->build( $template );
-$panel->display;
+$vars->{label_title} = gettext('DB Name');
+$vars->{list} = Vhffs::Panel::Pgsql::search( $vhffs , $name );
+
+$panel->render('admin/misc/list.tt', $vars);

Modified: trunk/vhffs-panel/templates/Makefile.am
===================================================================
--- trunk/vhffs-panel/templates/Makefile.am	2011-05-24 05:53:41 UTC (rev 1800)
+++ trunk/vhffs-panel/templates/Makefile.am	2011-05-24 05:53:49 UTC (rev 1801)
@@ -32,7 +32,6 @@
 	admin/object/editembedded.tmpl \
 	admin/object/part.tmpl \
 	admin/object/search.tmpl \
-	admin/pgsql/part.tmpl \
 	admin/pgsql/search.tmpl \
 	admin/repository/search.tmpl \
 	admin/svn/search.tmpl \

Deleted: trunk/vhffs-panel/templates/admin/pgsql/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/pgsql/part.tmpl	2011-05-24 05:53:41 UTC (rev 1800)
+++ trunk/vhffs-panel/templates/admin/pgsql/part.tmpl	2011-05-24 05:53:49 UTC (rev 1801)
@@ -1,16 +0,0 @@
-<TMPL_LOOP NAME="DBS">
-<tr>
-	<td>
-		<TMPL_VAR ESCAPE=1 NAME="DBNAME">
-	</td>
-	<td>
-		<TMPL_VAR ESCAPE=1 NAME="GROUPNAME"> 
-	</td>
-	<td>
-		<TMPL_VAR ESCAPE=1 NAME="STATE"> 
-	</td>
-	<td>
-		<a href="/pgsql/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR ESCAPE=1 NAME="DBNAME">"><TMPL_VAR ESCAPE=1 NAME="ACTION"></a>
-	</td>
-</tr>
-</TMPL_LOOP>