From c6f77306fc013afa1c9647d3ff395f3d42b52286 Mon Sep 17 00:00:00 2001 From: Guillaume Rousse <guillaume.rousse@renater.fr> Date: Mon, 10 Dec 2018 16:57:40 +0100 Subject: [PATCH] rename displayname -> display_name --- bin/update-metadata.in | 2 +- conf/manager.sql | 2 +- lib/AccountManager/Entity.pm | 4 ++-- templates/web/edugain/select_email.tt2.html | 2 +- templates/web/renater/select_email.tt2.html | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/update-metadata.in b/bin/update-metadata.in index 840e486..ca4a6e0 100755 --- a/bin/update-metadata.in +++ b/bin/update-metadata.in @@ -105,7 +105,7 @@ foreach my $id (split(/, */, $configuration->{groups}->{list})) { db => $db, type => $entry->{type}, entityid => $entry->{entityid}, - displayname => $entry->{display_name}, + display_name => $entry->{display_name}, information_url => $entry->{information_url}, organization_url => $entry->{organization_url}, ); diff --git a/conf/manager.sql b/conf/manager.sql index 44a7dad..892eade 100644 --- a/conf/manager.sql +++ b/conf/manager.sql @@ -15,7 +15,7 @@ CREATE TABLE entities ( entityid varchar(200) NOT NULL, information_url varchar(200) DEFAULT NULL, organization_url varchar(200) DEFAULT NULL, - displayname varchar(500) DEFAULT NULL, + display_name varchar(500) DEFAULT NULL, contacts varchar(2000) DEFAULT NULL, federations varchar(50) DEFAULT NULL, PRIMARY KEY (id), diff --git a/lib/AccountManager/Entity.pm b/lib/AccountManager/Entity.pm index 6e219f1..7b70996 100644 --- a/lib/AccountManager/Entity.pm +++ b/lib/AccountManager/Entity.pm @@ -15,7 +15,7 @@ __PACKAGE__->meta->setup( id => { type => 'bigserial', not_null => 1 }, entityid => { type => 'varchar', length => 200, not_null => 1 }, type => { type => 'varchar', length => 3 }, - displayname => { type => 'varchar', length => 500 }, + display_name => { type => 'varchar', length => 500 }, information_url => { type => 'varchar', length => 200 }, organization_url => { type => 'varchar', length => 200 }, contacts => { type => 'array' }, @@ -37,7 +37,7 @@ sub print { "Entity ID=%s; entityid=%s; displayname=%s; contacts=%s\n", $self->id(), $self->entityid(), - $self->displayname() || '', + $self->display_name() || '', join(',', $self->contacts()); } diff --git a/templates/web/edugain/select_email.tt2.html b/templates/web/edugain/select_email.tt2.html index 73260ca..7ccc224 100644 --- a/templates/web/edugain/select_email.tt2.html +++ b/templates/web/edugain/select_email.tt2.html @@ -10,7 +10,7 @@ <div class="content clearfix"> <h2>[% lh.maketext("Select your email address") %]</h2> - <p>[% lh.maketext("Before you can create test accounts at this Identity Provider, we need to ensure you are a legitimate administrator of '[_1]'.", sp.displayname) %]</p> + <p>[% lh.maketext("Before you can create test accounts at this Identity Provider, we need to ensure you are a legitimate administrator of '[_1]'.", sp.display_name()) %]</p> [% IF sp.contacts.defined %] <fieldset> diff --git a/templates/web/renater/select_email.tt2.html b/templates/web/renater/select_email.tt2.html index 4f426e7..fb32d1c 100644 --- a/templates/web/renater/select_email.tt2.html +++ b/templates/web/renater/select_email.tt2.html @@ -10,7 +10,7 @@ <div class="content clearfix"> <h2>[% lh.maketext("Select your email address") %]</h2> - <p>[% lh.maketext("Before you can create test accounts at this Identity Provider, we need to ensure you are a legitimate administrator of '[_1]'.", sp.displayname) %]</p> + <p>[% lh.maketext("Before you can create test accounts at this Identity Provider, we need to ensure you are a legitimate administrator of '[_1]'.", sp.display_name()) %]</p> [% IF sp.contacts.defined %] <fieldset> -- GitLab