database upgraded and interface added

This commit is contained in:
Finn 2017-11-23 14:54:59 +00:00
parent f5b94098fb
commit a4b307ad6c
13 changed files with 2506 additions and 14 deletions

View file

@ -85,9 +85,11 @@ sub valid_read {
order_by => { -desc => 'submitted_at' },
},
);
my $associations = $valid_org->entity->associations;
$c->stash(
valid_org => $valid_org,
transactions => $transactions,
associations => $associations,
);
}
@ -143,7 +145,7 @@ sub merge_list {
$c->redirect_to( '/admin/organisations/' . $org_id );
return;
}
my $org_rs = $c->result_set->search(
{
id => { '!=' => $org_id },

View file

@ -6,7 +6,7 @@ use warnings;
use base 'DBIx::Class::Schema';
our $VERSION = 16;
our $VERSION = 17;
__PACKAGE__->load_namespaces;

View file

@ -37,6 +37,11 @@ __PACKAGE__->might_have(
"Pear::LocalLoop::Schema::Result::User" => "entity_id",
);
__PACKAGE__->might_have(
"associations",
"Pear::LocalLoop::Schema::Result::EntityAssociation" => "entity_id",
);
__PACKAGE__->has_many(
"purchases",
"Pear::LocalLoop::Schema::Result::Transaction",
@ -44,13 +49,6 @@ __PACKAGE__->has_many(
{ cascade_copy => 0, cascade_delete => 0 },
);
__PACKAGE__->has_many(
"associations",
"Pear::LocalLoop::Schema::Result::EntityAssociation",
{ "foreign.entity_id" => "self.id" },
{ cascade_copy => 0, cascade_delete => 0 },
);
__PACKAGE__->has_many(
"sales",
"Pear::LocalLoop::Schema::Result::Transaction",

View file

@ -5,11 +5,6 @@ use warnings;
use base 'DBIx::Class::Core';
__PACKAGE__->load_components(qw/
InflateColumn::DateTime
TimeStamp
/);
__PACKAGE__->table("entity_association");
__PACKAGE__->add_columns(