diff --git a/application/modules/admin/controllers/IndexController.php b/application/modules/admin/controllers/IndexController.php index 77b005a530b4752cf6465423c8316df77a4ee49e..19ea63e21fc1eae6a88d13885fe30d43535ec0af 100644 --- a/application/modules/admin/controllers/IndexController.php +++ b/application/modules/admin/controllers/IndexController.php @@ -24,7 +24,7 @@ class Admin_IndexController extends ZendAfi_Controller_Action { . $this->view->tag('span', $this->_(' version %s', $this->view->tag('a', BOKEH_RELEASE_NUMBER, - ['href' => BOKEH_REMOTE_FILES . 'blob/' . BOKEH_VERSION . '/VERSIONS'])), + ['href' => BOKEH_REMOTE_FILES . 'blob/master/VERSIONS'])), ['class' => 'version']); $this->view->user = Class_Users::getIdentity(); diff --git a/library/Class/AdminVar.php b/library/Class/AdminVar.php index f7849630629ae0446c3c291f34b147d81a275885..2fb6bc5ed7733bf857c3061aa44a27d4a221f7e2 100644 --- a/library/Class/AdminVar.php +++ b/library/Class/AdminVar.php @@ -328,7 +328,7 @@ class Class_AdminVarLoader extends Storm_Model_Loader { 'FACETTE_INTERET_LIBELLE' => Class_AdminVar_Meta::newDefault('Libellé de la facette centres d\'intérêt'), 'FACETTE_MATIERE_LIBELLE' => Class_AdminVar_Meta::newDefault('Libellé de la facette matière'), 'FACETTE_TAG_LIBELLE' => Class_AdminVar_Meta::newDefault('Libellé de la facette tag'), - 'UNLEASHED_FACETS' => Class_AdminVar_Meta::newMultiInput($this->_('Liste des codes des facettes qui ne sont pas limitées à l\'affichage dans le résultat de recherche<br/>Exemple : T => Type de doc, Y => Annexe, B => Bibliothèque, ... (Voir <a href="' . BOKEH_REMOTE_FILES . 'blob/' . BOKEH_VERSION . '/library/Class/Codification.php#L24">la liste complète</a>)')), + 'UNLEASHED_FACETS' => Class_AdminVar_Meta::newMultiInput($this->_('Liste des codes des facettes qui ne sont pas limitées à l\'affichage dans le résultat de recherche<br/>Exemple : T => Type de doc, Y => Annexe, B => Bibliothèque, ... (Voir <a href="' . BOKEH_REMOTE_FILES . 'blob/master/library/Class/Codification.php#L24">la liste complète</a>)')), 'BOITE_PANIER_AUTO' => Class_AdminVar_Meta::newOnOff($this->_('Ajouter automatiquement une boîte panier dans la division flottante')), 'EXTRA_SKIN_PATH' => Class_AdminVar_Meta::newDefault($this->_('Chemin vers les skins personnalisées, relatif à %s', Class_Profil_Skin::EXTRA_PATH)), 'ENABLE_COLLABORATIVE_BROWSING' => Class_AdminVar_Meta::newOnOff($this->_('Activation de la navigation collaborative')), diff --git a/library/Class/WebService/Redmine/Issue.php b/library/Class/WebService/Redmine/Issue.php index a3a1c911f760ed6bb9805282c1d5b95e6a53d982..e3bccad28f6e0c8973cab5ad2ee50175a60d4622 100644 --- a/library/Class/WebService/Redmine/Issue.php +++ b/library/Class/WebService/Redmine/Issue.php @@ -55,7 +55,7 @@ class Class_WebService_Redmine_Issue extends Class_Entity { public function getTechnicalInformations() { $datas = [$this->_('Url : ') . Class_Url::rootUrl() . Class_Url::baseUrl(), - $this->_('Version : ') . BOKEH_RELEASE_NUMBER . ' (' . BOKEH_VERSION . ')', + $this->_('Version : %s', BOKEH_RELEASE_NUMBER), $this->_('Navigateur : ') . Zend_Controller_Front::getInstance()->getRequest()->getHeader('User-Agent'), $this->_('Base de données : ') . Zend_Db_Table::getDefaultAdapter()->getConfig()['dbname']]; diff --git a/library/startup.php b/library/startup.php index aa86e902600cb24b3c7b732d4cde7663dabed251..d7d9a5d9d03214cd6f84be5536e152fb49a7eb0a 100644 --- a/library/startup.php +++ b/library/startup.php @@ -86,8 +86,6 @@ class Bokeh_Engine { defineConstant('BOKEH_REMOTE_FILES', 'http://git.afi-sa.fr/afi/opacce/'); - defineConstant('BOKEH_VERSION', (substr(BOKEH_MAJOR_VERSION, -1) % 2) ? 'master' : 'stable'); - defineConstant('ROOT_PATH', realpath(dirname(__FILE__).'/..').'/'); defineConstant('ZEND_FRAMEWORK_PATH', ROOT_PATH . 'library/storm/zf/library/'); diff --git a/tests/library/Class/AdminVarTest.php b/tests/library/Class/AdminVarTest.php index 824bfdf2cac372a7aee8d5ff531c3a149161d749..cbfc80e43c5fa56af7dd987c308ce6f1a6bcb1e4 100644 --- a/tests/library/Class/AdminVarTest.php +++ b/tests/library/Class/AdminVarTest.php @@ -89,7 +89,7 @@ class AdminVarTestGet extends AdminVarTestCase { ['id' => 'UNLEASHED_FACETS', 'valeur' => '']); - $this->assertContains('/blob/' . BOKEH_VERSION . '/library/Class/Codification.php', Class_AdminVar::getStaticMeta('UNLEASHED_FACETS')->getDescription()); + $this->assertContains('/blob/master/library/Class/Codification.php', Class_AdminVar::getStaticMeta('UNLEASHED_FACETS')->getDescription()); } }