SF.net SVN: ledger-smb:[3749] trunk

[..hidden..]

Revision: 3749
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=3749&view=rev
Author:   einhverfr
Date:     2011-09-25 23:25:49 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
Merging from branches/1.3

Modified Paths:
--------------
    trunk/LedgerSMB/Form.pm
    trunk/LedgerSMB.pm
    trunk/VERSION
    trunk/dists/rpm/ledgersmb.spec
    trunk/dists/source/build.sh
    trunk/scripts/setup.pl
    trunk/sql/modules/admin.sql

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.3:3711-3746
   + /branches/1.3:3711-3748

Modified: trunk/LedgerSMB/Form.pm
===================================================================
--- trunk/LedgerSMB/Form.pm	2011-09-25 23:11:46 UTC (rev 3748)
+++ trunk/LedgerSMB/Form.pm	2011-09-25 23:25:49 UTC (rev 3749)
@@ -150,7 +150,7 @@
     #menubar will be deprecated, replaced with below
     $self->{lynx} = 1 if ( ( defined $self->{path} ) && ( $self->{path} =~ /lynx/i ) );
 
-    $self->{version}   = "1.3.0 rc2";
+    $self->{version}   = "1.3.0 rc3";
     $self->{dbversion} = "1.3.0";
 
     bless $self, $type;

Modified: trunk/LedgerSMB.pm
===================================================================
--- trunk/LedgerSMB.pm	2011-09-25 23:11:46 UTC (rev 3748)
+++ trunk/LedgerSMB.pm	2011-09-25 23:25:49 UTC (rev 3749)
@@ -220,7 +220,7 @@
 $CGI::Simple::POST_MAX = -1;
 
 package LedgerSMB;
-our $VERSION = '1.3.0 rc2';
+our $VERSION = '1.3.0 rc3';
 
 my $logger = Log::Log4perl->get_logger('LedgerSMB');
 

Modified: trunk/VERSION
===================================================================
--- trunk/VERSION	2011-09-25 23:11:46 UTC (rev 3748)
+++ trunk/VERSION	2011-09-25 23:25:49 UTC (rev 3749)
@@ -1 +1 @@
-1.3.0 rc2
+1.3.0 rc3

Modified: trunk/dists/rpm/ledgersmb.spec
===================================================================
--- trunk/dists/rpm/ledgersmb.spec	2011-09-25 23:11:46 UTC (rev 3748)
+++ trunk/dists/rpm/ledgersmb.spec	2011-09-25 23:25:49 UTC (rev 3749)
@@ -1,7 +1,7 @@
 # RPM spec written for and tested on CentOS 4 and CentOS 5 
 Summary: LedgerSMB - Open Source accounting software
 Name: ledgersmb
-Version: 1.3.0_rc2
+Version: 1.3.0_rc3
 Release: 1
 License: GPL
 URL: http://www.ledgersmb.org/

Modified: trunk/dists/source/build.sh
===================================================================
--- trunk/dists/source/build.sh	2011-09-25 23:11:46 UTC (rev 3748)
+++ trunk/dists/source/build.sh	2011-09-25 23:25:49 UTC (rev 3749)
@@ -2,7 +2,7 @@
 
 # Simple script to prepare for release
 
-version="1.3.0_rc2";
+version="1.3.0_rc3";
 build_d="../release";
 
 if test -d $build_d/ledgersmb; then

Modified: trunk/scripts/setup.pl
===================================================================
--- trunk/scripts/setup.pl	2011-09-25 23:11:46 UTC (rev 3748)
+++ trunk/scripts/setup.pl	2011-09-25 23:25:49 UTC (rev 3749)
@@ -46,6 +46,9 @@
     my ($request) = @_;
     $request->{_locale}->new('en');
     my $creds = LedgerSMB::Auth::get_credentials();
+    if (!$request->{database}){
+        $request->error($request->{_locale}->text('No database specified'));
+    }
     my $database = LedgerSMB::Database->new(
                {username => $creds->{username},
             company_name => $request->{database},
@@ -153,6 +156,7 @@
 
     # Credentials set above via environment variables --CT
     $request->{dbh} = DBI->connect("dbi:Pg:dbname=$request->{database}");
+    $request->{dbh}->{AutoCommit} = 0;
     my $locale = $request->{_locale};
 
     my @pre_upgrade_checks = (
@@ -280,6 +284,7 @@
 
     # Credentials set above via environment variables --CT
     $request->{dbh} = DBI->connect("dbi:Pg:dbname=$request->{database}");
+    $request->{dbh}->{AutoCommit} = 0;
     my $locale = $request->{_locale};
 
     my $table = $request->{dbh}->quote_identifier($request->{table});
@@ -402,6 +407,7 @@
             # mapping going. --CT
 
             $request->{dbh} = DBI->connect("dbi:Pg:dbname=$request->{database}");
+            $request->{dbh}->{AutoCommit} = 0;
 
            @{$request->{salutations}} 
             = $request->call_procedure(procname => 'person__list_salutations' ); 
@@ -462,6 +468,7 @@
     $request->{dbh} = DBI->connect("dbi:Pg:dbname=$request->{database}",
                                    $creds->{login},
                                    $creds->{password});
+    $request->{dbh}->{AutoCommit} = 0;
     my $user = LedgerSMB::DBObject::Admin->new({base => $request});
     $user->save_user;
     if ($request->{perms} == 1){
@@ -477,7 +484,7 @@
         $request->call_procedure(procname => 'admin__add_user_to_role',
                                  args => [ $request->{username},
                                            "lsmb_$request->{database}__".
-                                            "manage_users",
+                                            "users_manage",
                                          ]
         );
     } else {

Modified: trunk/sql/modules/admin.sql
===================================================================
--- trunk/sql/modules/admin.sql	2011-09-25 23:11:46 UTC (rev 3748)
+++ trunk/sql/modules/admin.sql	2011-09-25 23:25:49 UTC (rev 3749)
@@ -24,7 +24,6 @@
     
         -- Issue the grant
         select rolname into a_role from pg_roles where rolname = in_role;
-        
         IF NOT FOUND THEN
             RAISE EXCEPTION 'Cannot grant permissions of a non-existant role.';
         END IF;
@@ -127,7 +126,7 @@
         select rolname into a_role from pg_roles where rolname = in_role;
         
         IF NOT FOUND THEN
-            RAISE EXCEPTION 'Cannot revoke permissions of a non-existant role.';
+            RAISE EXCEPTION 'Cannot revoke permissions of non-existant role $.';
         END IF;
         
         select rolname into a_user from pg_roles where rolname = in_username;

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