Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/labinvent

root
2 parents 6b9b1218 a7a6c329
Showing 7 changed files with 32 additions and 13 deletions Show diff stats
README-LABINVENT.md
database/.gitignore
database/update/script_sql/.gitignore
database/update/script_sql/db-update-2016-06-27-irap.sql
database/update/script_sql/db-update-2016-06-27.sql
install/installation-macos.sh
src/Template/Configurations/view.ctp
@@ -21,14 +21,14 @@ Logiciel testé et validé sur les configurations suivantes :
 	- Mysql : 5.1.73-3.el6_5
 	- Apache : 2.2.15-39.el6.centos
  
-- (TODO) Debian GNU/Linux 8.5 (jessie) (version IAS) :
-	- PHP : 5.6.20-0+deb8u1 (version de la distrib)
-	- Mysql : 
-	- Apache : 
-
-- (TODO) Centos 6.4 (version test Etienne Pallier linux) :
-	- PHP : 5.3.3 (to be upgraded to 5.6)
-	- MYSQL : 5.1.73
+- Debian GNU/Linux 8.5 (jessie) (version IAS) :
+	- PHP : 5.6.22
+	- Mysql : MariaDB 10.0.25
+	- Apache : 2.4.10
+
+- Centos 6.4 (version test Etienne Pallier linux) :
+	- PHP : 5.6.23
+	- MYSQL : 5.5.50
 	- APACHE : 2.2.15
  
 - (TODO) Linux CentOS (version test Elodie Bourrec)
@@ -7,3 +7,4 @@
 /labinvent_2.1_12-05-16.sql~
 /mode_panique.sh~
 /set_mode_install.sql~
+/set_mode_install-build.sql
 /*-build.sql
-/db-update-2016-06-24-build.sql
 /*~
-/db-update-2016-06-24-2-build.sql
@@ -2,8 +2,13 @@ use database;
  
 set foreign_key_checks=0;
  
+ALTER TABLE `documents` DROP FOREIGN KEY `fk_documents_type_documents_id`;
 ALTER TABLE `documents` DROP `type_document_id`;
  
+ALTER TABLE type_documents ENGINE=innoDB;
+ALTER TABLE users ENGINE=innoDB;
+ALTER TABLE configurations ENGINE=innoDB;
+
 ALTER TABLE `documents` ADD `type_document_id` int(11) DEFAULT NULL;
 ALTER TABLE `documents` ADD CONSTRAINT `fk_documents_type_documents_id` FOREIGN KEY (`type_document_id`) REFERENCES `type_documents` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION;
  
@@ -10,6 +10,10 @@ CREATE TABLE IF NOT EXISTS `type_documents` (
   PRIMARY KEY (`id`)
 );
  
+ALTER TABLE type_documents ENGINE=innoDB;
+ALTER TABLE users ENGINE=innoDB;
+ALTER TABLE configurations ENGINE=innoDB;
+
 ALTER TABLE `documents` ADD CONSTRAINT `fk_documents_type_documents_id` FOREIGN KEY (`type_document_id`) REFERENCES `type_documents` (`id`) ON DELETE NO ACTION ON UPDATE NO ACTION;
  
 ALTER TABLE `documents` DROP `chemin`;
@@ -0,0 +1,11 @@
+# Pour Mac OS recent (10.10, Yosemite), la syntaxe du SED est differente
+# Il faut donc transformer les instructions sed a l'interieur des fichiers bash
+
+# USAGE: ./installation-macos.sh
+
+macosfile=installation.macos.temp.sh
+cp installation.sh $macosfile
+sed -e "s/ -i / -i '' /" -i '' $macosfile
+chmod +x $macosfile
+./$macosfile
+rm -f $macosfile
@@ -117,11 +117,11 @@
     	echo '</div>';
  
     if ($configuration->use_ldap):
-    	echo '<h3 id="t_informations_fichiers" style="cursor: pointer;">';
-    	echo '<i class="icon-chevron-down" style="font-size: 14px;" id="i_informations_fichiers"></i>';
+    	echo '<h3 id="t_fichiers" style="cursor: pointer;">';
+    	echo '<i class="icon-chevron-down" style="font-size: 14px;" id="i_fichiers"></i>';
     	echo '<span style="text-decoration: underline;">LDAP</span>';
     	echo '</h3>';
-    	echo '<div id="informations_fichiers" style="margin-bottom: 20px;">';
+    	echo '<div id="fichiers" style="margin-bottom: 20px;">';
     	echo '<table>';
     	echo '<tr><th style="width: 250px;"></th><th></th></tr>';
     	$displayElement(__('Utilisation du LDAP'), $ldap);