From 1151179355b8a2ab9ed6dd3b2260e854e8a4501e Mon Sep 17 00:00:00 2001 From: einhverfr Date: Wed, 26 Sep 2007 17:52:12 +0000 Subject: Moving Aurynn's set() function from DBObject to LedgerSMB namespaces since it is not specific to database defined objects git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1670 4979c152-3d1c-0410-bac9-87ea11338e46 --- LedgerSMB.pm | 17 +++++++++++++++++ LedgerSMB/DBObject.pm | 18 ++---------------- LedgerSMB/DBObject/Admin.pm | 2 +- scripts/menu.pl | 1 + 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/LedgerSMB.pm b/LedgerSMB.pm index 97e30403..3d5454a5 100755 --- a/LedgerSMB.pm +++ b/LedgerSMB.pm @@ -89,6 +89,11 @@ defined, that field is used for ordering the rows. If not, runningnumber is used. Behavior is not defined when index points to a field containing non-numbers. +=item set (@attrs) + +Copies the given key=>vars to $self. Allows for finer control of +merging hashes into self. + =back =head1 Copyright (C) 2006, The LedgerSMB core team. @@ -755,5 +760,17 @@ sub type { sub DESTROY {} +sub set { + + my $self = shift @_; + my %args = @_; + + for my $arg (keys(%args)) { + $self->{$arg} = $args{$arg}; + } + return 1; + +} + 1; diff --git a/LedgerSMB/DBObject.pm b/LedgerSMB/DBObject.pm index 657b30e5..f52724c7 100644 --- a/LedgerSMB/DBObject.pm +++ b/LedgerSMB/DBObject.pm @@ -23,10 +23,8 @@ this way as is any information that is needed. =item exec_method ($self, procname => $function_name, args => \@args) -=item set (@attrs) - -Copies the given key=>vars to $self. Allows for finer control of -merging hashes into self. +Provides the basic mapping of parameters to the SQL stored procedure function +arguments. =back @@ -283,16 +281,4 @@ sub _parse_array { return @return_array; } -sub set { - - my $self = shift @_; - my %args = @_; - - for my $arg (keys(%args)) { - $self->{$arg} = $args{$arg}; - } - return 1; - -} - 1; diff --git a/LedgerSMB/DBObject/Admin.pm b/LedgerSMB/DBObject/Admin.pm index 74ee238b..e09e1214 100644 --- a/LedgerSMB/DBObject/Admin.pm +++ b/LedgerSMB/DBObject/Admin.pm @@ -193,4 +193,4 @@ sub get_salutations { return $sth->fetchall_arrayref( {} ); } -1; \ No newline at end of file +1; diff --git a/scripts/menu.pl b/scripts/menu.pl index 6154fa45..81628db6 100644 --- a/scripts/menu.pl +++ b/scripts/menu.pl @@ -71,6 +71,7 @@ sub root_doc { $request->{title} = "LedgerSMB $request->{VERSION} -- ". "$request->{login} -- $request->{_user}->{dbname}"; + $request->call_procedure(procname => ); if (!$request->{menubar}){ $request->{main} = "splash.html" if $request->{main} eq 'company_logo'; $request->{main} = "am.pl?action=recurring_transactions" -- cgit v1.2.3