Now display things are in the templates, inheritance can be tidied up.

3 files changed, 1 insertions, 12 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Barnet.pm b/perllib/FixMyStreet/Cobrand/Barnet.pm
index 7320edc40..0d38d30f2 100644
--- a/perllib/FixMyStreet/Cobrand/Barnet.pm
+++ b/perllib/FixMyStreet/Cobrand/Barnet.pm
@@ -1,16 +1,9 @@
 package FixMyStreet::Cobrand::Barnet;
-use mro 'c3';
-use parent 'FixMyStreet::Cobrand::FixMyStreet';
 use parent 'FixMyStreet::Cobrand::UKCouncils';
 
 use strict;
 use warnings;
 
-# As parent FixMyStreet has blank. XXX Do this better?
-sub restriction {
-    return { cobrand => 'barnet' };
-}
-
 sub council_id { return 2489; }
 sub council_area { return 'Barnet'; }
 sub council_name { return 'Barnet Council'; }
diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm
index 62827eec1..b39f7ed5b 100644
--- a/perllib/FixMyStreet/Cobrand/Bromley.pm
+++ b/perllib/FixMyStreet/Cobrand/Bromley.pm
@@ -1,6 +1,4 @@
 package FixMyStreet::Cobrand::Bromley;
-use mro 'c3';
-use parent 'FixMyStreet::Cobrand::FixMyStreet';
 use parent 'FixMyStreet::Cobrand::UKCouncils';
 
 use strict;
@@ -16,8 +14,6 @@ sub base_url {
     return 'https://fix.bromley.gov.uk';
 }
 
-sub admin_base_url { '' }
-
 sub path_to_web_templates {
     my $self = shift;
     return [
diff --git a/perllib/FixMyStreet/Cobrand/EmptyHomes.pm b/perllib/FixMyStreet/Cobrand/EmptyHomes.pm
index a7634e565..679c49889 100644
--- a/perllib/FixMyStreet/Cobrand/EmptyHomes.pm
+++ b/perllib/FixMyStreet/Cobrand/EmptyHomes.pm
@@ -1,5 +1,5 @@
 package FixMyStreet::Cobrand::EmptyHomes;
-use base 'FixMyStreet::Cobrand::FixMyStreet';
+use base 'FixMyStreet::Cobrand::UK';
 
 use strict;
 use warnings;