Etienne Pallier / labinvent

Commit a7a6c32992717d6c7461f69fd9ef758b8f61f52d

Authored by Alexandre
1 parent c6d3901a
Exists in master and in 3 other branches dev, dev-IRAP, dev-LATMOS

bugfixes

Showing 4 changed files with 13 additions and 3 deletions   Show diff stats
Inline Side-by-side
database/.gitignore
  Diff comments   View file @a7a6c32
@@ -7,3 +7,4 @@ @@ -7,3 +7,4 @@
7 /labinvent_2.1_12-05-16.sql~ 7 /labinvent_2.1_12-05-16.sql~
8 /mode_panique.sh~ 8 /mode_panique.sh~
9 /set_mode_install.sql~ 9 /set_mode_install.sql~
  10 +/set_mode_install-build.sql
database/update/script_sql/db-update-2016-06-27-irap.sql
  Diff comments   View file @a7a6c32
@@ -2,8 +2,13 @@ use database; @@ -2,8 +2,13 @@ use database;
2 2
3 set foreign_key_checks=0; 3 set foreign_key_checks=0;
4 4
  5 +ALTER TABLE `documents` DROP FOREIGN KEY `fk_documents_type_documents_id`;
5 ALTER TABLE `documents` DROP `type_document_id`; 6 ALTER TABLE `documents` DROP `type_document_id`;
6 7
  8 +ALTER TABLE type_documents ENGINE=innoDB;
  9 +ALTER TABLE users ENGINE=innoDB;
  10 +ALTER TABLE configurations ENGINE=innoDB;
  11 +
7 ALTER TABLE `documents` ADD `type_document_id` int(11) DEFAULT NULL; 12 ALTER TABLE `documents` ADD `type_document_id` int(11) DEFAULT NULL;
8 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; 13 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;
9 14
database/update/script_sql/db-update-2016-06-27.sql
  Diff comments   View file @a7a6c32
@@ -10,6 +10,10 @@ CREATE TABLE IF NOT EXISTS `type_documents` ( @@ -10,6 +10,10 @@ CREATE TABLE IF NOT EXISTS `type_documents` (
10 PRIMARY KEY (`id`) 10 PRIMARY KEY (`id`)
11 ); 11 );
12 12
  13 +ALTER TABLE type_documents ENGINE=innoDB;
  14 +ALTER TABLE users ENGINE=innoDB;
  15 +ALTER TABLE configurations ENGINE=innoDB;
  16 +
13 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; 17 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;
14 18
15 ALTER TABLE `documents` DROP `chemin`; 19 ALTER TABLE `documents` DROP `chemin`;
src/Template/Configurations/view.ctp
  Diff comments   View file @a7a6c32
@@ -117,11 +117,11 @@ @@ -117,11 +117,11 @@
117 echo '</div>'; 117 echo '</div>';
118 118
119 if ($configuration->use_ldap): 119 if ($configuration->use_ldap):
120 - echo '<h3 id="t_informations_fichiers" style="cursor: pointer;">';  
121 - echo '<i class="icon-chevron-down" style="font-size: 14px;" id="i_informations_fichiers"></i>'; 120 + echo '<h3 id="t_fichiers" style="cursor: pointer;">';
  121 + echo '<i class="icon-chevron-down" style="font-size: 14px;" id="i_fichiers"></i>';
122 echo '<span style="text-decoration: underline;">LDAP</span>'; 122 echo '<span style="text-decoration: underline;">LDAP</span>';
123 echo '</h3>'; 123 echo '</h3>';
124 - echo '<div id="informations_fichiers" style="margin-bottom: 20px;">'; 124 + echo '<div id="fichiers" style="margin-bottom: 20px;">';
125 echo '<table>'; 125 echo '<table>';
126 echo '<tr><th style="width: 250px;"></th><th></th></tr>'; 126 echo '<tr><th style="width: 250px;"></th><th></th></tr>';
127 $displayElement(__('Utilisation du LDAP'), $ldap); 127 $displayElement(__('Utilisation du LDAP'), $ldap);