From d63190406de9e5f6e4a8ddf8cf61c19eb5120962 Mon Sep 17 00:00:00 2001
From: llaffont <laurent.laffont@gmail.com>
Date: Tue, 21 Jan 2014 15:01:24 +0100
Subject: [PATCH] =?UTF-8?q?Simplification=20interface=20config=20Cosmo.=20?=
 =?UTF-8?q?Les=20variables=20non=20utilis=C3=A9es=20sont=20cach=C3=A9es.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cosmogramme/php/_init.php            |  4 +--
 cosmogramme/php/_menu.php            | 14 +++++-----
 cosmogramme/php/config_variables.php |  2 +-
 cosmogramme/sql/patch/patch_190.sql  | 41 ++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 cosmogramme/sql/patch/patch_190.sql

diff --git a/cosmogramme/php/_init.php b/cosmogramme/php/_init.php
index 29b3fe846d0..251cce173d1 100644
--- a/cosmogramme/php/_init.php
+++ b/cosmogramme/php/_init.php
@@ -1,7 +1,7 @@
 <?PHP
 // Constantes
-define("VERSION_COSMOGRAMME","6.41");
-define("PATCH_LEVEL","189");
+define("VERSION_COSMOGRAMME","6.42");
+define("PATCH_LEVEL","190");
 define("APPLI","cosmogramme");
 define("COSMOPATH", "/var/www/html/vhosts/opac2/www/htdocs");
 define("CRLF", chr(13) . chr(10));
diff --git a/cosmogramme/php/_menu.php b/cosmogramme/php/_menu.php
index 0d9a8574683..a10bbac8b93 100644
--- a/cosmogramme/php/_menu.php
+++ b/cosmogramme/php/_menu.php
@@ -91,22 +91,22 @@ else
 	?>
 	<div class="menu_section">Configurations</div>
 	<?php
+	ligneMenu("Variables","config_variables.php");
 	ligneMenu("Démarrer un nouvel OPAC","integre_generation_pergame.php");
-	ligneMenu("Plannification des intégrations","integre_plannification.php");
-	ligneMenu("Intégrations programmées","config_integrations.php");
+	ligneMenu("Annexes","codif_annexe.php");
 	ligneMenu("Profils de données","config_profil_donnees.php");
-	ligneMenu("Variables","config_variables.php");
+	ligneMenu("Intégrations programmées","config_integrations.php");
+	ligneMenu("Plannification des intégrations","integre_plannification.php");
 	?>
 	<div class="menu_section">Autorités et codifications</div>
 	<?php
+	ligneMenu("Sections","codif_section.php");
+	ligneMenu("Genres","codif_genre.php");
+	ligneMenu("Emplacements","codif_emplacement.php");
 	ligneMenu("Auteurs","codif_auteur.php");
 	ligneMenu("Matières","codif_matiere.php");
 	ligneMenu("Indices Dewey","codif_dewey.php");
 	ligneMenu("Indices PCDM4","codif_pcdm4.php");
-	ligneMenu("Sections","codif_section.php");
-	ligneMenu("Genres","codif_genre.php");
-	ligneMenu("Emplacements","codif_emplacement.php");
-	ligneMenu("Annexes","codif_annexe.php");
 	?>
 	<div class="menu_section">Statistiques</div>
 	<?php
diff --git a/cosmogramme/php/config_variables.php b/cosmogramme/php/config_variables.php
index bb070cfde2f..cfb860a8efa 100644
--- a/cosmogramme/php/config_variables.php
+++ b/cosmogramme/php/config_variables.php
@@ -170,7 +170,7 @@ $lib_groupe[6]="Pointeurs";
 $lib_groupe[7]="Chemins et variables système";
 
 // Requete
-$data=$sql->fetchAll("select * from variables order by groupe,ordre");
+$data=$sql->fetchAll("select * from variables where hidden=false order by groupe,ordre");
 foreach($data as $ligne)
 {
 	// Changement de groupe
diff --git a/cosmogramme/sql/patch/patch_190.sql b/cosmogramme/sql/patch/patch_190.sql
new file mode 100644
index 00000000000..380b4cb90d0
--- /dev/null
+++ b/cosmogramme/sql/patch/patch_190.sql
@@ -0,0 +1,41 @@
+update variables set ordre=0 where clef='site_retrait_resa';
+update variables set ordre=1 where clef='mode_doublon';
+update variables set ordre=1 where clef='ean_345';
+update variables set ordre=2 where clef='unicite_code_barres';
+update variables set ordre=2 where clef='controle_codes_barres';
+
+update variables set ordre=1 where clef='mail_admin';
+update variables set ordre=60 where clef='portail_nom_affichage';
+
+update variables set ordre=1 where clef='types_docs';
+update variables set ordre=2 where clef='sigb';
+
+
+update variables set ordre=1 where clef='unimarc_zone_titre';
+update variables set ordre=2 where clef='unimarc_zone_matiere';
+update variables set ordre=19 where clef='champs_sup';
+update variables set ordre=20 where clef='champ_code_barres';
+update variables set ordre=21 where clef='champ_cote';
+
+alter table variables add column hidden boolean default false;
+
+
+update variables set hidden=true where clef in (
+ 'sigb',	 
+ 'comm_sigb',
+ 'id_article_periodique',				
+ 'nature_docs',				
+ 'code_qualite',
+ 'import_type_operation',
+ 'import_format',
+ 'transco_accents',
+ 'format_z3950',
+ 'format_query_z39.50',
+ 'oui_non',
+ 'champ_cote',
+ 'champ_code_barres',
+ 'champs_abonne',
+ 'champs_pret',
+ 'champs_reservation',
+ 'champs_ascii'
+);
-- 
GitLab