Pear-Trading/Foodloop-Server
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix admin login test and required changes for entity upgrade

Browse source
This commit is contained in:
Tom Bloor 2017-08-31 13:35:49 +01:00
parent 6cd3113912
commit 18992784b2
4 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/Pear/LocalLoop/Controller/Admin.pm
View file

@ -5,10 +5,10 @@ sub under {
my $c = shift;
if ( $c->is_user_authenticated ) {
return 1 if defined $c->current_user->administrator;
return 1 if $c->current_user->is_admin;
}
$c->redirect_to('/');
return undef;
return 0;
}
sub home {
@ -16,8 +16,8 @@ sub home {
my $user_rs = $c->schema->resultset('User');
my $token_rs = $c->schema->resultset('AccountToken');
my $pending_orgs_rs = $c->schema->resultset('PendingOrganisation');
my $pending_transaction_rs = $c->schema->resultset('PendingTransaction');
my $pending_orgs_rs = $c->schema->resultset('Organisation')->search({ pending => 1 });
my $pending_transaction_rs = $pending_orgs_rs->entity->sales;
$c->stash(
user_count => $user_rs->count,
tokens => {

10
lib/Pear/LocalLoop/Schema/ResultSet/Entity.pm Normal file
View file

@ -0,0 +1,10 @@
package Pear::LocalLoop::Schema::ResultSet::Entity;
use strict;
use warnings;
use base 'DBIx::Class::ResultSet';
sub sales { shift->search_related('sales', @_) }
1;

10
lib/Pear/LocalLoop/Schema/ResultSet/Organisation.pm Normal file
View file

@ -0,0 +1,10 @@
package Pear::LocalLoop::Schema::ResultSet::Organisation;
use strict;
use warnings;
use base 'DBIx::Class::ResultSet';
sub entity { shift->search_related('entity', @_) }
1;