diff --git a/library/Class/AdminVar.php b/library/Class/AdminVar.php index ab235a5d5632fa0be07478bfaa514efc50020c20..087dc603450ce526455af85959ae087f596557b0 100644 --- a/library/Class/AdminVar.php +++ b/library/Class/AdminVar.php @@ -169,7 +169,8 @@ class Class_AdminVarLoader extends Storm_Model_Loader { 'PACK_MOBILE' => Class_AdminVar_Meta::newOnOff($this->_('Activation des fonctions avancées du téléphone'))->bePrivate(), 'CNIL_CONSENT_ENABLE' => Class_AdminVar_Meta::newOnOff('Affiche la demande de consentement avant l\'insertion de cookies ou autres traceurs'), 'BUID' => Class_AdminVar_Meta::newRawText($this->_('Identifiant unique (attention: la modification de cette variable impactera les outils de suivi de cette installation)'))->bePrivate(), - 'STATUS_REPORT_PUSH_URL' => Class_AdminVar_Meta::newRawText($this->_('URL destinataire du rapport d\'état du système (0 pour désactiver)'), ['value' => 'http://pola.afi-sa.net/smile.php'])->bePrivate()], + 'STATUS_REPORT_PUSH_URL' => Class_AdminVar_Meta::newRawText($this->_('URL destinataire du rapport d\'état du système (0 pour désactiver)'), ['value' => 'http://pola.afi-sa.net/smile.php'])->bePrivate(), + 'STATUS_REPORT_TAGS' => Class_AdminVar_Meta::newMultiInput($this->_('Liste des tags à ajouter au rapport d\'état du système'))->bePrivate()], 'cosmogramme' => [ 'DATE_LAST_FULL_INTEGRATION_USERS' => Class_AdminVar_Meta::newDefault($this->_('Date du dernier import total des abonnés (modifié par cosmogramme)')), diff --git a/library/Class/Systeme/Report.php b/library/Class/Systeme/Report.php index d400bc9c46a1504080abf916a4071db1fdfb874d..18dc12b0e4c5cecfe00e54039b9f5daecad7e90e 100644 --- a/library/Class/Systeme/Report.php +++ b/library/Class/Systeme/Report.php @@ -87,6 +87,7 @@ class Class_Systeme_Report_Portal extends Class_Systeme_Report_Abstract { $visitor->visitData('url', $this->_('URL principale'), Class_Url::siteUrl()); $visitor->visitData('label', $this->_('Libellé principal'), Class_Profil::getPortail()->getLibelle()); $visitor->visitDataArray('skins', $this->_('Thèmes utilisés'), $this->_profilSkins()); + $visitor->visitDataArray('tags', $this->_('Tags'), $this->_fetchTags()); } @@ -98,6 +99,18 @@ class Class_Systeme_Report_Portal extends Class_Systeme_Report_Abstract { ->getArrayCopy())); } + + protected function _fetchTags() { + return + array_values( + array_filter( + array_map('trim', + preg_split( + '/[^0-9a-zA-Z_]+/', + (string)constant('STATUS_REPORT_TAGS') + . ',' + . (string)Class_AdminVar::get('STATUS_REPORT_TAGS'))))); + } } diff --git a/tests/library/ZendAfi/View/Helper/Status/JsonTest.php b/tests/library/ZendAfi/View/Helper/Status/JsonTest.php index 885d36929c7e091107f44732e4b30ac16edfe560..793530891873be1bbfaf5c55817f6efbd52423cd 100644 --- a/tests/library/ZendAfi/View/Helper/Status/JsonTest.php +++ b/tests/library/ZendAfi/View/Helper/Status/JsonTest.php @@ -44,6 +44,13 @@ class ZendAfi_View_Helper_Status_JsonTest extends ZendAfi_View_Helper_Status_Tes } + /** @test */ + public function portalTagsShouldContainsTestingIgnoreInProdAndDedicatedServer() { + $this->assertEquals(['TESTING', 'IGNORE', 'IN_PROD', 'DEDICATED_SERVER'], + $this->_report['portal']['tags']); + } + + /** @test */ public function headersVersionShouldBeCurrentVersion() { $this->assertEquals(BOKEH_RELEASE_NUMBER, $this->_report['headers']['version']); diff --git a/tests/library/ZendAfi/View/Helper/Status/TestCase.php b/tests/library/ZendAfi/View/Helper/Status/TestCase.php index 3905d8f7745d8011921ec81c09fe00a92467d50f..eb1f5ab1ce3289c10627afd7015c6ae01e6b6b5c 100644 --- a/tests/library/ZendAfi/View/Helper/Status/TestCase.php +++ b/tests/library/ZendAfi/View/Helper/Status/TestCase.php @@ -142,6 +142,12 @@ abstract class ZendAfi_View_Helper_Status_TestCase extends ViewHelperTestCase { } + protected function _setupReportTags() { + defineConstant('STATUS_REPORT_TAGS', '@,TESTING IGNORE"'); + Class_AdminVar::set('STATUS_REPORT_TAGS', 'IN_PROD; DEDICATED_SERVER,'); + } + + protected function _setupBokeh() { Class_AdminVar::set('NOM_DOMAINE', 'library.annecy.fr'); $this @@ -150,7 +156,8 @@ abstract class ZendAfi_View_Helper_Status_TestCase extends ViewHelperTestCase { ->_setupRecords() ->_setupUsers() ->_setupILS() - ->_setupDigitalResources(); + ->_setupDigitalResources() + ->_setupReportTags(); } protected function _setupVars() {