projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b2ff114
)
ACL bootstrapping
author
ivan
<ivan>
Mon, 19 Jun 2006 12:15:32 +0000
(12:15 +0000)
committer
ivan
<ivan>
Mon, 19 Jun 2006 12:15:32 +0000
(12:15 +0000)
FS/FS/CurrentUser.pm
patch
|
blob
|
history
FS/bin/freeside-upgrade
patch
|
blob
|
history
diff --git
a/FS/FS/CurrentUser.pm
b/FS/FS/CurrentUser.pm
index
13d3416
..
37ed359
100644
(file)
--- a/
FS/FS/CurrentUser.pm
+++ b/
FS/FS/CurrentUser.pm
@@
-1,11
+1,13
@@
package FS::CurrentUser;
package FS::CurrentUser;
-use vars qw($CurrentUser);
+use vars qw($CurrentUser
$upgrade_hack
);
#not at compile-time, circular dependancey causes trouble
#use FS::Record qw(qsearchs);
#use FS::access_user;
#not at compile-time, circular dependancey causes trouble
#use FS::Record qw(qsearchs);
#use FS::access_user;
+$upgrade_hack = 0;
+
=head1 NAME
FS::CurrentUser - Package representing the current user
=head1 NAME
FS::CurrentUser - Package representing the current user
@@
-19,8
+21,9
@@
FS::CurrentUser - Package representing the current user
sub load_user {
my( $class, $user ) = @_; #, $pass
sub load_user {
my( $class, $user ) = @_; #, $pass
- #XXX remove me at some point
- return "" if $user =~ /^fs_(queue|selfservice)$/;
+ return "" if $upgrade_hack;
+
+ #return "" if $user =~ /^fs_(queue|selfservice)$/;
#not the best thing in the world...
eval "use FS::Record qw(qsearchs);";
#not the best thing in the world...
eval "use FS::Record qw(qsearchs);";
diff --git
a/FS/bin/freeside-upgrade
b/FS/bin/freeside-upgrade
index
25d883f
..
a1212ae
100755
(executable)
--- a/
FS/bin/freeside-upgrade
+++ b/
FS/bin/freeside-upgrade
@@
-5,6
+5,7
@@
use vars qw($DEBUG $DRY_RUN);
use Term::ReadKey;
use DBIx::DBSchema 0.31;
use FS::UID qw(adminsuidsetup checkeuid datasrc ); #getsecrets);
use Term::ReadKey;
use DBIx::DBSchema 0.31;
use FS::UID qw(adminsuidsetup checkeuid datasrc ); #getsecrets);
+use FS::CurrentUser;
use FS::Schema qw( dbdef dbdef_dist reload_dbdef );
$DEBUG = 1;
use FS::Schema qw( dbdef dbdef_dist reload_dbdef );
$DEBUG = 1;
@@
-12,6
+13,7
@@
$DEBUG = 1;
die "Not running uid freeside!" unless checkeuid();
my $user = shift or die &usage;
die "Not running uid freeside!" unless checkeuid();
my $user = shift or die &usage;
+$FS::CurrentUser::upgrade_hack = 1;
my $dbh = adminsuidsetup($user);
#needs to match FS::Schema...
my $dbh = adminsuidsetup($user);
#needs to match FS::Schema...