From 0c3dee9d7be35a4283adc9862eb4cd0c4915e646 Mon Sep 17 00:00:00 2001
From: efalcy <efalcy@afi-sa.fr>
Date: Tue, 23 Jul 2019 10:29:06 +0200
Subject: [PATCH] tag 8.0.21

---
 FEATURES/95222                 | 10 ----------
 VERSIONS                       |  7 +++++++
 VERSIONS_HOTLINE/89462         |  1 -
 VERSIONS_WIP/93032             |  1 -
 VERSIONS_WIP/95222             |  1 -
 library/Class/Feature/List.php | 11 +++++++++++
 library/startup.php            |  2 +-
 7 files changed, 19 insertions(+), 14 deletions(-)
 delete mode 100644 FEATURES/95222
 delete mode 100644 VERSIONS_HOTLINE/89462
 delete mode 100644 VERSIONS_WIP/93032
 delete mode 100644 VERSIONS_WIP/95222

diff --git a/FEATURES/95222 b/FEATURES/95222
deleted file mode 100644
index fb0b6c9913f..00000000000
--- a/FEATURES/95222
+++ /dev/null
@@ -1,10 +0,0 @@
-        '95222' =>
-            ['Label' => $this->_('Boite Auteurs'),
-             'Desc' => $this->_('Permet d\'afficher dynamiquement des auteurs à partir d\'une sélection de notices (domaines, paniers)'),
-             'Image' => '',
-             'Video' => 'https://www.youtube.com/watch?v=aK4Dz3LVOIo',
-             'Category' => 'Recherche',
-             'Right' => function($feature_description, $user) {return true;},
-             'Wiki' => 'http://wiki.bokeh-library-portal.org/index.php?title=Boite_auteurs',
-             'Test' => '',
-             'Date' => '2019-07-18'],
\ No newline at end of file
diff --git a/VERSIONS b/VERSIONS
index ee53f7828f7..f49017f9cf4 100644
--- a/VERSIONS
+++ b/VERSIONS
@@ -1,3 +1,10 @@
+23/07/2019 - v8.0.21
+
+ - ticket #89462 : Serveur OAI : Ajout d'un metadataPrefix oai_dc_bokeh plus riche que l'oai_dc pour les notices d'albums de la bibliothèque numérique Bokeh
+ - ticket #95222 : Ajout de la boite Auteurs
+ - ticket #93032 : Administration des rendez-vous : Recherche sur les champs personalisés 
+
+
 16/07/2019 - v8.0.20
 
  - ticket #94707 : Bibliothèque numérique : correction de l'export EAD
diff --git a/VERSIONS_HOTLINE/89462 b/VERSIONS_HOTLINE/89462
deleted file mode 100644
index 95f8e85b92c..00000000000
--- a/VERSIONS_HOTLINE/89462
+++ /dev/null
@@ -1 +0,0 @@
- - ticket #89462 : Serveur OAI : Ajout d'un metadataPrefix oai_dc_bokeh plus riche que l'oai_dc pour les notices d'albums de la bibliothèque numérique Bokeh
\ No newline at end of file
diff --git a/VERSIONS_WIP/93032 b/VERSIONS_WIP/93032
deleted file mode 100644
index 48a8c667be7..00000000000
--- a/VERSIONS_WIP/93032
+++ /dev/null
@@ -1 +0,0 @@
- - ticket #93032 : Administration des rendez-vous : Recherche sur les champs personalisés 
\ No newline at end of file
diff --git a/VERSIONS_WIP/95222 b/VERSIONS_WIP/95222
deleted file mode 100644
index 8cd4aaec3ba..00000000000
--- a/VERSIONS_WIP/95222
+++ /dev/null
@@ -1 +0,0 @@
- - ticket #95222 : Ajout de la boite Auteurs
\ No newline at end of file
diff --git a/library/Class/Feature/List.php b/library/Class/Feature/List.php
index 6510119783f..a6dadfb9c2c 100644
--- a/library/Class/Feature/List.php
+++ b/library/Class/Feature/List.php
@@ -676,6 +676,17 @@ class Class_Feature_List {
              'Date' => '2019-06-06'],
 
 
+            '95222' =>
+            ['Label' => $this->_('Boite Auteurs'),
+             'Desc' => $this->_('Permet d\'afficher dynamiquement des auteurs à partir d\'une sélection de notices (domaines, paniers)'),
+             'Image' => '',
+             'Video' => 'https://www.youtube.com/watch?v=aK4Dz3LVOIo',
+             'Category' => 'Recherche',
+             'Right' => function($feature_description, $user) {return true;},
+             'Wiki' => 'http://wiki.bokeh-library-portal.org/index.php?title=Boite_auteurs',
+             'Test' => '',
+             'Date' => '2019-07-18'],
+
     ];
   }
 }
\ No newline at end of file
diff --git a/library/startup.php b/library/startup.php
index 9f413b893ea..bd60f174571 100644
--- a/library/startup.php
+++ b/library/startup.php
@@ -81,7 +81,7 @@ class Bokeh_Engine {
 
   function setupConstants() {
     defineConstant('BOKEH_MAJOR_VERSION','8.0');
-    defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.20');
+    defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.21');
 
     defineConstant('BOKEH_REMOTE_FILES', 'http://git.afi-sa.fr/afi/opacce/');
 
-- 
GitLab