From 1b1bdbdf9c8c8143b60f28600b5e588fcd8b2354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Fri, 15 May 2009 11:27:33 +0000
Subject: [PATCH] Fix for statistics field presentation when name was not set.
and added som parameters in config template
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1506 44740490-163a-0410-bde0-09ae8108e29a
---
.../config-templates/module_statistics.php | 13 +++++++------
.../lib/Statistics/FieldPresentation/Entity.php | 7 +++++--
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/modules/statistics/config-templates/module_statistics.php b/modules/statistics/config-templates/module_statistics.php
index e684ccd1a..66f452d7c 100644
--- a/modules/statistics/config-templates/module_statistics.php
+++ b/modules/statistics/config-templates/module_statistics.php
@@ -5,14 +5,15 @@
$config = array (
- // Access control on statistics page.
'protected' => FALSE,
+ 'auth' => 'admin',
+ 'useridattr' => 'eduPersonPrincipalName',
- /*
- * Which authenticatino source should be used for authentication exception from admin module.
- * Set to NULL if only using admin auth.
- */
- //'auth' => 'feide',
+ 'default' => 'sso_hoursweek',
+
+ 'allowedUsers' => array(
+ 'admin'
+ ),
'default' => 'sso_hoursweek',
diff --git a/modules/statistics/lib/Statistics/FieldPresentation/Entity.php b/modules/statistics/lib/Statistics/FieldPresentation/Entity.php
index 27b13b989..6d1bf9d68 100644
--- a/modules/statistics/lib/Statistics/FieldPresentation/Entity.php
+++ b/modules/statistics/lib/Statistics/FieldPresentation/Entity.php
@@ -9,8 +9,11 @@ class sspmod_statistics_Statistics_FieldPresentation_Entity extends sspmod_stati
$translation = array('_' => 'All services');
foreach($this->fields AS $field) {
- if (array_key_exists($field, $metadata))
- $translation[$field] = $this->template->t($metadata[$field]['name'], array(), FALSE);
+ if (array_key_exists($field, $metadata)) {
+ if (array_key_exists('name', $metadata[$field])) {
+ $translation[$field] = $this->template->t($metadata[$field]['name'], array(), FALSE);
+ }
+ }
}
return $translation;
}
--
GitLab