From 8fcb92b135b8a5b255489a23d294bf0521cb0b92 Mon Sep 17 00:00:00 2001
From: adiouf <adiouf@git-test.afi-sa.fr>
Date: Fri, 6 Sep 2013 15:22:07 +0000
Subject: [PATCH] =?UTF-8?q?web=20service=20r=C3=A9cup=C3=A9ration=20abonne?=
=?UTF-8?q?,=20ajout=20m=C3=A9thode=20getBorrowers=20qui=20retourne=20tous?=
=?UTF-8?q?=20les=20abonn=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
library/Class/AdminVar.php | 8 ++++++++
library/Class/Users.php | 11 +++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/library/Class/AdminVar.php b/library/Class/AdminVar.php
index 7a3204ddd16..ebcb15dad60 100644
--- a/library/Class/AdminVar.php
+++ b/library/Class/AdminVar.php
@@ -72,6 +72,7 @@ class Class_AdminVar extends Storm_Model_Abstract {
'ARTE_VOD_SSO_KEY',
'BABELTHEQUE_JS',
'MULTIMEDIA_KEY',
+ 'WEBKIOSK_KEY',
'CSS_EDITOR',
'CMS_FORMULAIRES',
'MENU_BOITE',
@@ -286,6 +287,13 @@ class Class_AdminVar extends Storm_Model_Abstract {
return ('' != self::get('MULTIMEDIA_KEY'));
}
+ /**
+ * @return bool
+ */
+ public static function isWebkioskEnabled() {
+ return ('' != self::get('WEBKIOSK_KEY'));
+ }
+
/**
* @return array
diff --git a/library/Class/Users.php b/library/Class/Users.php
index f6abbc09365..cb2170731bf 100644
--- a/library/Class/Users.php
+++ b/library/Class/Users.php
@@ -40,7 +40,7 @@ class UsersLoader extends Storm_Model_Loader {
$like = strtolower($search).'%';
- $all_users = Class_Users::findAll(sprintf($sql_template, $by_right, $like));
+ $all_users = $this->findAll(sprintf($sql_template, $by_right, $like));
if (!$by_right || count($all_users) >= $limit)
return $all_users;
@@ -71,7 +71,7 @@ class UsersLoader extends Storm_Model_Loader {
public function findAllByRightDirigerFormation() {
$users = array();
- $all_groups = Class_UserGroup::getLoader()->findAll();
+ $all_groups = Class_UserGroup::findAll();
foreach ($all_groups as $group) {
if ($group->hasRightDirigerFormation())
$users = array_merge($users , $group->getUsers());
@@ -141,6 +141,13 @@ class UsersLoader extends Storm_Model_Loader {
return false;
return $user->canAccessAllBibs();
}
+
+ /**
+ * @return array
+ */
+ public function getAllBorrowers(){
+ return $this->findAllBy(['role_level' => 2]);
+ }
}
--
GitLab