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

[..hidden..]

Revision: 5258
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5258&view=rev
Author:   einhverfr
Date:     2012-11-25 02:06:07 +0000 (Sun, 25 Nov 2012)
Log Message:
-----------
Fixing error saving user when import is set and no role exists

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/sql/modules/admin.sql

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2012-11-24 16:21:18 UTC (rev 5257)
+++ branches/1.3/Changelog	2012-11-25 02:06:07 UTC (rev 5258)
@@ -9,6 +9,7 @@
 * Fixed letterhead not showing up on emailed invoices (Chris T, h/t Kevin B)
 * Fixed blank screen on posting AR/IS/OE (Chris T)
 * Fixed ECA's not distinct on parts screen and search (Chris T, 3550075)
+* Fixed error saving imported user with no existing db role (Chris T, 3559844)
 
 Chris T is Chris Travers
 Kevin B is Kevin Bailey

Modified: branches/1.3/sql/modules/admin.sql
===================================================================
--- branches/1.3/sql/modules/admin.sql	2012-11-24 16:21:18 UTC (rev 5257)
+++ branches/1.3/sql/modules/admin.sql	2012-11-25 02:06:07 UTC (rev 5258)
@@ -367,7 +367,7 @@
         elsif in_import is false AND t_is_user is false 
               AND in_password IS NULL THEN
                 RAISE EXCEPTION 'No password';
-        elsif  t_is_role is false THEN
+        elsif  t_is_role is false and in_import IS FALSE THEN
             -- create an actual user
                 execute 'CREATE USER ' || quote_ident( in_username ) || 
                      ' WITH ENCRYPTED PASSWORD ' || quote_literal (in_password)

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