[open-ils-commits] [GIT] Evergreen ILS branch rel_2_3 updated. 953cd16194b454199b3029ac00e83287d533546b

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_3 has been updated
       via  953cd16194b454199b3029ac00e83287d533546b (commit)
      from  e956804719b1f4380293b5dc2ed1f420f075b478 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 953cd16194b454199b3029ac00e83287d533546b
Author: Jeff Godin <jgodin at tadl.org>
Date:   Tue May 29 10:28:50 2012 -0400

    Fix IDL and OU setting check for staged users
    
    The IDL had references to sequences that do not exist:
    
    staging.usr_stage_row_id_seq -- a typo, fixed
    
    In the case of staging.billing_address_stage_row_id_seq, the
    staging.billing_address_stage table is created with LIKE,
    and uses the sequence staging.mailing_address_stage_row_id_seq
    
    The OU setting check for the open-ils.actor.user.stage.create API
    call was not passing an org unit, and would always fail.
    
    We now pass the home_ou of the user being staged.
    
    At this point, the opac.allow_pending_user OU setting type must
    be manually created before its value can be set.
    
    Signed-off-by: Jeff Godin <jgodin at tadl.org>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 1286924..51fc33a 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -8596,7 +8596,7 @@ SELECT  usr,
 	</class>
 
     <class id="stgu" controller="open-ils.cstore" oils_obj:fieldmapper="staging::user_stage" oils_persist:tablename="staging.user_stage" reporter:label="User Stage">
-        <fields oils_persist:primary="row_id" oils_persist:sequence="staging.usr_stage_row_id_seq">
+        <fields oils_persist:primary="row_id" oils_persist:sequence="staging.user_stage_row_id_seq">
             <field reporter:label="Row ID" name="row_id" reporter:datatype="id"/>
             <field reporter:label="Row Date" name="row_date" reporter:datatype="timestamp"/>
             <field reporter:label="User Name" name="usrname" reporter:datatype="text"/>
@@ -8641,7 +8641,7 @@ SELECT  usr,
     </class>
 
     <class id="stgba" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="staging::billing_address_stage" oils_persist:tablename="staging.billing_address_stage" reporter:label="Billing Address Stage">
-        <fields oils_persist:primary="row_id" oils_persist:sequence="staging.billing_address_stage_row_id_seq">
+        <fields oils_persist:primary="row_id" oils_persist:sequence="staging.mailing_address_stage_row_id_seq">
             <field reporter:label="Row ID" name="row_id" reporter:datatype="id"/>
             <field reporter:label="Row Date" name="row_date" reporter:datatype="timestamp"/>
             <field reporter:label="User Name" name="usrname" reporter:datatype="text"/>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor/Stage.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor/Stage.pm
index 0e65c12..7e9aaaa 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor/Stage.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Actor/Stage.pm
@@ -33,8 +33,8 @@ __PACKAGE__->register_method (
 sub create_user_stage {
     my($self, $conn, $user, $mail_addr, $bill_addr, $statcats) = @_; # more?
 
-    return 0 unless $U->ou_ancestor_setting_value('opac.allow_pending_user');
     return OpenILS::Event->new('BAD_PARAMS') unless $user;
+    return 0 unless $U->ou_ancestor_setting_value($user->home_ou, 'opac.allow_pending_user');
 
     my $e = new_editor(xact => 1);
 

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/examples/fm_IDL.xml                       |    4 ++--
 .../lib/OpenILS/Application/Actor/Stage.pm         |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS