SF.net SVN: ledger-smb:[3897] branches/1.3

[..hidden..]

Revision: 3897
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3897&view=rev
Author:   einhverfr
Date:     2011-10-20 11:05:10 +0000 (Thu, 20 Oct 2011)
Log Message:
-----------
Fixed stylesheet/salutations display issue in user editing screen

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/UI/Admin/edit_user.html
    branches/1.3/scripts/admin.pl

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2011-10-20 08:23:37 UTC (rev 3896)
+++ branches/1.3/Changelog	2011-10-20 11:05:10 UTC (rev 3897)
@@ -9,6 +9,7 @@
 * Made errors saving chart of accounts entry more friendly (Chris T)
 * Fixed permissions issue involving yearend (Chris T)
 * Fixed filename issue in install.sh (Chris T)
+* Fixed stylesheet/salutations display issue in user editing screen (Chris T)
 
 Changelog for LedgerSMB 1.3.1
 * Language selection for invoice templates fixed (Chris T)

Modified: branches/1.3/UI/Admin/edit_user.html
===================================================================
--- branches/1.3/UI/Admin/edit_user.html	2011-10-20 08:23:37 UTC (rev 3896)
+++ branches/1.3/UI/Admin/edit_user.html	2011-10-20 11:05:10 UTC (rev 3897)
@@ -105,8 +105,8 @@
             <tr>
                 <td><?lsmb text('Country') ?></td>
                 <td>
-                    <?lsmb IF edit_location.country; 
-                        country_id = edit_location.country_id;
+                    <?lsmb IF user.entity.country_id; 
+                        country_id = user.entity.country_id;
                         ELSE; 
                         country_id = default_country;
                         END; -?>

Modified: branches/1.3/scripts/admin.pl
===================================================================
--- branches/1.3/scripts/admin.pl	2011-10-20 08:23:37 UTC (rev 3896)
+++ branches/1.3/scripts/admin.pl	2011-10-20 11:05:10 UTC (rev 3897)
@@ -56,17 +56,20 @@
         format => 'HTML', 
         path=>'UI'
     );
+    my @countries = $admin->get_countries();
+    my @salutations = $admin->get_salutations();
     my $template_data = 
             {
-                user=>$user_obj, 
-                roles=>@all_roles,
-                countries=>$admin->get_countries(),
-                user_roles=>$user_obj->{roles},
-                salutations=>$admin->get_salutations(),
+                           user => $user_obj, 
+                          roles => @all_roles,
+                      countries => $admin->get_countries(),
+                     user_roles => $user_obj->{roles},
                 default_country => $dcsetting->{value},
-                admin => $admin,
-                stylesheet => $request->{stylesheet},
+                          admin => $admin,
+                     stylesheet => $request->{stylesheet},
+                    salutations => ..hidden..,
             };
+
     
     for my $key (keys(%{$otd})) {
         
@@ -121,11 +124,11 @@
             {
                 user=>{user => $request, employee => $request}, 
                 countries=>$admin->get_countries(),
-                salutations=>$admin->get_salutations(),
+                stylesheet => $request->{stylesheet},
                 contact_classes=>$admin->get_contact_classes(),
                 default_country => $dcsetting->{value},
                 admin => $admin,
-                stylesheet => $request->{stylesheet},
+                salutations=>$admin->get_salutations(),
             }
           );
           return;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.