Further fixes to Recon and Admin. In testing.

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2296 4979c152-3d1c-0410-bac9-87ea11338e46

2 files changed, 5 insertions, 3 deletions

diff --git a/scripts/admin.pl b/scripts/admin.pl
index 29cf03c2..9db47f88 100644
--- a/scripts/admin.pl
+++ b/scripts/admin.pl
@@ -60,6 +60,9 @@ sub edit_user {
     # uses the same page as create_user, only pre-populated.
     my ($request) = @_;
     my $admin = LedgerSMB::DBObject::Admin->new(base=>$request, copy=>'user_id');
+    my $user = LedgerSMB::DBObject::User->new(base=>$request, copy=>'user_id');
+    
+    $user->get($request->{user_id});
     
     my $all_roles = $admin->get_roles();
 
@@ -84,10 +87,9 @@ sub edit_user {
         );
     }
     else {
-        my $edited_user = $admin->get_entire_user($request->{user});
         $template->render(
             {
-                user=>$edited_user, 
+                user=>$user, 
                 roles=>$all_roles,
                 user_roles=>$admin->get_user_roles($request->{user})
             }
diff --git a/scripts/recon.pl b/scripts/recon.pl
index f128e1d8..b5a5ddec 100644
--- a/scripts/recon.pl
+++ b/scripts/recon.pl
@@ -113,7 +113,7 @@ sub search {
             format=>'HTML',
             path=>"UI",
             mode=>$type,
-            accounts=>$recon->get_accounts();
+            accounts=>$recon->get_accounts()
         );
         return $template->render();
     }