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

[..hidden..]

Revision: 1694
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=1694&view=rev
Author:   einhverfr
Date:     2007-10-03 09:15:40 -0700 (Wed, 03 Oct 2007)

Log Message:
-----------
Cleaning up scripts/menu.pl slightly.

Modified Paths:
--------------
    trunk/scripts/menu.pl
    trunk/sql/Pg-database.sql

Modified: trunk/scripts/menu.pl
===================================================================
--- trunk/scripts/menu.pl	2007-10-03 05:15:02 UTC (rev 1693)
+++ trunk/scripts/menu.pl	2007-10-03 16:15:40 UTC (rev 1694)
@@ -71,8 +71,10 @@
     $request->{title} = "LedgerSMB $request->{VERSION} -- ".
 	"$request->{login} -- $request->{_user}->{dbname}";
 
-    $request->call_procedure(procname => );
-    if (!$request->{menubar}){
+    if ($request->{menubar}){
+        drilldown_menu($request);
+        return;
+    } else {
         $request->{main} = "splash.html" if $request->{main} eq 'company_logo';
         $request->{main} = "am.pl?action=recurring_transactions"
             if $request->{main} eq 'recurring_transactions';
@@ -83,9 +85,6 @@
             template => 'frameset',
 	     format => 'HTML'
 	);
-    } else {
-        drilldown_menu($request);
-        return;
     }
     $template->render($request);
 }

Modified: trunk/sql/Pg-database.sql
===================================================================
--- trunk/sql/Pg-database.sql	2007-10-03 05:15:02 UTC (rev 1693)
+++ trunk/sql/Pg-database.sql	2007-10-03 16:15:40 UTC (rev 1694)
@@ -149,7 +149,8 @@
 last_used TIMESTAMP default now(),
 ttl int default 3600 not null,
 users_id INTEGER NOT NULL references users(id),
-transaction_id INTEGER NOT NULL
+transaction_id INTEGER NOT NULL,
+javascript_auth BOOL DEFAULT FALSE
 );
 
 --


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