From 9d27cb8c31ac442ef2939d2104899a00e1fb2b9f Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillaume.rousse@renater.fr>
Date: Thu, 9 Nov 2017 17:40:24 +0100
Subject: [PATCH] fix accessors
---
templates/accountProfiles/alumni1.tt2 | 4 ++--
templates/accountProfiles/employee1.tt2 | 4 ++--
templates/accountProfiles/fullset1.tt2 | 4 ++--
templates/accountProfiles/generic1.tt2 | 4 ++--
templates/accountProfiles/librarywalkin1.tt2 | 4 ++--
templates/accountProfiles/limitedset1.tt2 | 4 ++--
templates/accountProfiles/researcher1.tt2 | 4 ++--
templates/accountProfiles/student1.tt2 | 4 ++--
templates/accountProfiles/student2.tt2 | 4 ++--
templates/accountProfiles/teacher1.tt2 | 4 ++--
templates/accountProfiles/teacher2.tt2 | 4 ++--
templates/accountProfiles/valid-accounts.php.tt2 | 6 +++---
12 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/templates/accountProfiles/alumni1.tt2 b/templates/accountProfiles/alumni1.tt2
index 7ca5621..d89e987 100644
--- a/templates/accountProfiles/alumni1.tt2
+++ b/templates/accountProfiles/alumni1.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
[% SET account_profile = {
'type' => 'Alumni',
diff --git a/templates/accountProfiles/employee1.tt2 b/templates/accountProfiles/employee1.tt2
index d39b476..88f3282 100644
--- a/templates/accountProfiles/employee1.tt2
+++ b/templates/accountProfiles/employee1.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
[% SET account_profile = {
'type' => 'Employee',
diff --git a/templates/accountProfiles/fullset1.tt2 b/templates/accountProfiles/fullset1.tt2
index 834e447..6ddaa48 100644
--- a/templates/accountProfiles/fullset1.tt2
+++ b/templates/accountProfiles/fullset1.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
[% SET account_profile = {
'type' => 'FullSet',
diff --git a/templates/accountProfiles/generic1.tt2 b/templates/accountProfiles/generic1.tt2
index 6a5712b..ed49adb 100644
--- a/templates/accountProfiles/generic1.tt2
+++ b/templates/accountProfiles/generic1.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
[% SET account_profile = {
'type' => 'Generic',
diff --git a/templates/accountProfiles/librarywalkin1.tt2 b/templates/accountProfiles/librarywalkin1.tt2
index 8da2788..096b1ec 100644
--- a/templates/accountProfiles/librarywalkin1.tt2
+++ b/templates/accountProfiles/librarywalkin1.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
[% SET account_profile = {
'type' => 'Library walk-in',
diff --git a/templates/accountProfiles/limitedset1.tt2 b/templates/accountProfiles/limitedset1.tt2
index edaa483..6beb400 100644
--- a/templates/accountProfiles/limitedset1.tt2
+++ b/templates/accountProfiles/limitedset1.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
[% SET account_profile = {
'type' => 'LimitedSet',
diff --git a/templates/accountProfiles/researcher1.tt2 b/templates/accountProfiles/researcher1.tt2
index 1971535..f2e57b4 100644
--- a/templates/accountProfiles/researcher1.tt2
+++ b/templates/accountProfiles/researcher1.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
[% SET account_profile = {
'type' => 'Researcher',
diff --git a/templates/accountProfiles/student1.tt2 b/templates/accountProfiles/student1.tt2
index a9bf528..3a6e7c6 100644
--- a/templates/accountProfiles/student1.tt2
+++ b/templates/accountProfiles/student1.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
[% SET account_profile = {
'type' => 'Student',
diff --git a/templates/accountProfiles/student2.tt2 b/templates/accountProfiles/student2.tt2
index b0fdc7d..60bf538 100644
--- a/templates/accountProfiles/student2.tt2
+++ b/templates/accountProfiles/student2.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
[% SET account_profile = {
'type' => 'Student',
diff --git a/templates/accountProfiles/teacher1.tt2 b/templates/accountProfiles/teacher1.tt2
index 606d95a..0128501 100644
--- a/templates/accountProfiles/teacher1.tt2
+++ b/templates/accountProfiles/teacher1.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
[% SET account_profile = {
'type' => 'Teacher',
diff --git a/templates/accountProfiles/teacher2.tt2 b/templates/accountProfiles/teacher2.tt2
index 8b8b749..f7a4807 100644
--- a/templates/accountProfiles/teacher2.tt2
+++ b/templates/accountProfiles/teacher2.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
[% SET account_profile = {
'type' => 'Teacher',
diff --git a/templates/accountProfiles/valid-accounts.php.tt2 b/templates/accountProfiles/valid-accounts.php.tt2
index 297d040..e067406 100644
--- a/templates/accountProfiles/valid-accounts.php.tt2
+++ b/templates/accountProfiles/valid-accounts.php.tt2
@@ -4,8 +4,8 @@ $validTestAccounts = array (
'authcrypt:Hash',
[% FOREACH account IN accounts %]
- [% PROCESS "${account.get('account_profile')}.tt2" %]
- 'user[% account.get('id') %]:{SHA256}[% account.get('user_password_hash') %]=' => array(
+ [% PROCESS "${account.account_profile()}.tt2" %]
+ 'user[% account.id() %]:{SHA256}[% account.user_password_hash() %]=' => array(
[% FOREACH attribute IN account_profile.pairs -%]
[% NEXT IF attribute.key.match('^(type|comment)$') %]
[% IF attribute.value.isa('SCALAR') -%]
@@ -14,7 +14,7 @@ $validTestAccounts = array (
'[% attribute.key %]' => array('[% attribute.value.join("','") %]'),
[% END %]
[% END %]
- 'associatedSP' => "[% account.get('sp_entityid') %]",
+ 'associatedSP' => "[% account.sp_entityid() %]",
),
--
GitLab