From e6d9781e9c85fa060ca8e867c65456240027b9f0 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Mon, 8 Oct 2012 14:19:35 +0000
Subject: [PATCH] =?UTF-8?q?Editeur=20CSS:=20chargement=20de=20l'IDE=20dans?=
=?UTF-8?q?=20le=20cas=20de=20l'=C3=A9dition=20CSS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/modules/opac/controllers/AmberController.php | 3 +++
application/modules/opac/views/scripts/head.phtml | 4 +++-
library/Class/ScriptLoader.php | 8 +++++++-
library/Class/Users.php | 8 ++++++++
4 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/application/modules/opac/controllers/AmberController.php b/application/modules/opac/controllers/AmberController.php
index 7da4568ac3b..49c659fa1db 100644
--- a/application/modules/opac/controllers/AmberController.php
+++ b/application/modules/opac/controllers/AmberController.php
@@ -35,6 +35,9 @@ class AmberController extends Zend_Controller_Action {
if (Class_ScriptLoader::getInstance()->isAmberModeDeploy())
return $this;
+ if (!Class_Users::getIdentity()->isSuperAdmin())
+ return $this;
+
$request_uri = $this->_request->getRequestUri();
$filename = array_last(explode('/', $request_uri));
$contents = $this->_request->getRawBody();
diff --git a/application/modules/opac/views/scripts/head.phtml b/application/modules/opac/views/scripts/head.phtml
index 950095a0986..0f37b587061 100644
--- a/application/modules/opac/views/scripts/head.phtml
+++ b/application/modules/opac/views/scripts/head.phtml
@@ -40,7 +40,9 @@ if ($this->header_js)
$head_scripts->addJQueryReady('$.getScript("'.$this->header_js.'")');
if (Class_Users::isCurrentUserAdmin())
- $head_scripts->addAmberPackage('AFI-OPAC')->loadAmber();
+ $head_scripts
+ ->addAmberPackage('AFI-OPAC')
+ ->loadAmber(true);
if ($this->accessibilite_on) { //Feuilles de styles pour les déficiences visuelles
$head_scripts
diff --git a/library/Class/ScriptLoader.php b/library/Class/ScriptLoader.php
index dff4b7c8965..d926198a1b3 100644
--- a/library/Class/ScriptLoader.php
+++ b/library/Class/ScriptLoader.php
@@ -32,6 +32,7 @@ class Class_ScriptLoader {
protected $_jquery_ready_scripts;
protected $_is_mobile = false;
protected $_version_pergame_hash;
+ protected $_amber_mode_deploy = true;
/**
* @return ScriptLoader
@@ -65,10 +66,12 @@ class Class_ScriptLoader {
/**
+ * @param boolean $development
* @return ScriptLoader
*/
- public function loadAmber() {
+ public function loadAmber($development = false) {
$this->_should_load_amber = true;
+ $this->_amber_mode_deploy = ($development == false);
return $this;
}
@@ -373,6 +376,9 @@ class Class_ScriptLoader {
* @return Boolean
*/
public function isAmberModeDeploy() {
+ if ($this->_amber_mode_deploy)
+ return true;
+
if (null == $amber = Zend_Registry::get('cfg')->get('amber'))
return true;
diff --git a/library/Class/Users.php b/library/Class/Users.php
index 481c480172f..71e5924ad39 100644
--- a/library/Class/Users.php
+++ b/library/Class/Users.php
@@ -260,6 +260,14 @@ class Class_Users extends Storm_Model_Abstract {
}
+ /**
+ * @return bool
+ */
+ public function isSuperAdmin() {
+ return $this->getRoleLevel() >= ZendAfi_Acl_AdminControllerRoles::SUPER_ADMIN;
+ }
+
+
/**
* @return bool
*/
--
GitLab