diff options
| -rw-r--r-- | scripts/menu.pl | 9 | ||||
| -rw-r--r-- | sql/Pg-database.sql | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/menu.pl b/scripts/menu.pl index 81628db6..f873398f 100644 --- a/scripts/menu.pl +++ b/scripts/menu.pl @@ -71,8 +71,10 @@ sub root_doc { $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 @@ sub root_doc { template => 'frameset', format => 'HTML' ); - } else { - drilldown_menu($request); - return; } $template->render($request); } diff --git a/sql/Pg-database.sql b/sql/Pg-database.sql index 76b22079..c4f4b630 100644 --- a/sql/Pg-database.sql +++ b/sql/Pg-database.sql @@ -149,7 +149,8 @@ token VARCHAR(32) CHECK(length(token) = 32), 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 ); -- |