From 9e2e27bda4a44c0303cea5bc774d566e2e9f40df Mon Sep 17 00:00:00 2001
From: aurynn_cmd <aurynn_cmd@4979c152-3d1c-0410-bac9-87ea11338e46>
Date: Wed, 17 Sep 2008 23:22:02 +0000
Subject: Further fixes to Reconciliation, the new Admin interface, and a small
 change to Company.sql

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2327 4979c152-3d1c-0410-bac9-87ea11338e46
---
 scripts/admin.pl | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'scripts/admin.pl')

diff --git a/scripts/admin.pl b/scripts/admin.pl
index 9db47f88..7ba5a40e 100644
--- a/scripts/admin.pl
+++ b/scripts/admin.pl
@@ -63,9 +63,9 @@ sub edit_user {
     my $user = LedgerSMB::DBObject::User->new(base=>$request, copy=>'user_id');
     
     $user->get($request->{user_id});
-    
-    my $all_roles = $admin->get_roles();
 
+    my @all_roles = $admin->get_roles();
+    
     my $template = LedgerSMB::Template->new( 
         user => $user, 
         template => 'Admin/edit_user', 
@@ -82,16 +82,21 @@ sub edit_user {
             {
                 user=>$admin->get_entire_user(),
                 roles=>$all_roles,
-                user_roles=>$admin->get_user_roles($request->{username})
+                user_roles=>$admin->get_user_roles($request->{username}),
+                salutations=>$admin->get_salutations(),
             }
         );
     }
     else {
+#        print STDERR Dumper($user);
+#        print STDERR Dumper(@all_roles);
+#        print STDERR Dumper($user->{roles});
         $template->render(
             {
                 user=>$user, 
-                roles=>$all_roles,
-                user_roles=>$admin->get_user_roles($request->{user})
+                roles=>@all_roles,
+                user_roles=>$user->{roles},
+                salutations=>$admin->get_salutations(),
             }
         );
     }
-- 
cgit v1.2.3