From 449fe8f33357c318dd74ad041fca148bd99709d5 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Fri, 28 Sep 2018 15:08:35 +0200
Subject: [PATCH 1/5] Modification du titre
---
client/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/index.html b/client/index.html
index 1040b14d..81e34736 100755
--- a/client/index.html
+++ b/client/index.html
@@ -4,7 +4,7 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
- <title>Vitis</title>
+ <title>Vitis 2018.05</title>
<script src="javascript/externs/jquery/jquery-1.11.3.min.js"></script>
<script src="javascript/externs/mobile-detect/mobile-detect.min.js"></script>
<script src="https://www.google.com/recaptcha/api.js" async defer></script>
--
GitLab
From 700adff2b85818eaedc3456171b0904a88d57929 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Fri, 5 Oct 2018 14:03:21 +0200
Subject: [PATCH 2/5] Change dependencies model
---
{vas/_install => _install}/apache.conf | 0
.../dependencies/mapserver/.htaccess | 0
.../dependencies/mapserver/linux/apache.conf | 0
.../dependencies/mapserver/windows/apache.conf | 0
.../dependencies/php/linux/apache.conf | 0
{vas/_install => _install}/dependencies/php/php.ini | 0
.../dependencies/php/windows/apache.conf | 0
.../dependencies/pycron/crontab.txt | 0
.../dependencies/websocket/apache.conf | 0
.../dependencies/websocket/linux/websocket_vitis | 0
.../dependencies/websocket/websocket.cfg | 0
{vas/_install => _install}/dependency.xml | 1 -
{client/_install => _install}/fileToDelete.txt | 0
{client/_install => _install}/folderToDelete.txt | 0
{vas/_install => _install}/listModuleApache.txt | 0
client/_install/dependency.xml | 10 ----------
client/_install/listModuleApache.txt | 5 -----
17 files changed, 16 deletions(-)
rename {vas/_install => _install}/apache.conf (100%)
rename {vas/_install => _install}/dependencies/mapserver/.htaccess (100%)
rename {vas/_install => _install}/dependencies/mapserver/linux/apache.conf (100%)
rename {vas/_install => _install}/dependencies/mapserver/windows/apache.conf (100%)
rename {vas/_install => _install}/dependencies/php/linux/apache.conf (100%)
rename {vas/_install => _install}/dependencies/php/php.ini (100%)
rename {vas/_install => _install}/dependencies/php/windows/apache.conf (100%)
rename {vas/_install => _install}/dependencies/pycron/crontab.txt (100%)
rename {vas/_install => _install}/dependencies/websocket/apache.conf (100%)
rename {vas/_install => _install}/dependencies/websocket/linux/websocket_vitis (100%)
rename {vas/_install => _install}/dependencies/websocket/websocket.cfg (100%)
rename {vas/_install => _install}/dependency.xml (93%)
rename {client/_install => _install}/fileToDelete.txt (100%)
mode change 100755 => 100644
rename {client/_install => _install}/folderToDelete.txt (100%)
mode change 100755 => 100644
rename {vas/_install => _install}/listModuleApache.txt (100%)
delete mode 100755 client/_install/dependency.xml
delete mode 100755 client/_install/listModuleApache.txt
diff --git a/vas/_install/apache.conf b/_install/apache.conf
similarity index 100%
rename from vas/_install/apache.conf
rename to _install/apache.conf
diff --git a/vas/_install/dependencies/mapserver/.htaccess b/_install/dependencies/mapserver/.htaccess
similarity index 100%
rename from vas/_install/dependencies/mapserver/.htaccess
rename to _install/dependencies/mapserver/.htaccess
diff --git a/vas/_install/dependencies/mapserver/linux/apache.conf b/_install/dependencies/mapserver/linux/apache.conf
similarity index 100%
rename from vas/_install/dependencies/mapserver/linux/apache.conf
rename to _install/dependencies/mapserver/linux/apache.conf
diff --git a/vas/_install/dependencies/mapserver/windows/apache.conf b/_install/dependencies/mapserver/windows/apache.conf
similarity index 100%
rename from vas/_install/dependencies/mapserver/windows/apache.conf
rename to _install/dependencies/mapserver/windows/apache.conf
diff --git a/vas/_install/dependencies/php/linux/apache.conf b/_install/dependencies/php/linux/apache.conf
similarity index 100%
rename from vas/_install/dependencies/php/linux/apache.conf
rename to _install/dependencies/php/linux/apache.conf
diff --git a/vas/_install/dependencies/php/php.ini b/_install/dependencies/php/php.ini
similarity index 100%
rename from vas/_install/dependencies/php/php.ini
rename to _install/dependencies/php/php.ini
diff --git a/vas/_install/dependencies/php/windows/apache.conf b/_install/dependencies/php/windows/apache.conf
similarity index 100%
rename from vas/_install/dependencies/php/windows/apache.conf
rename to _install/dependencies/php/windows/apache.conf
diff --git a/vas/_install/dependencies/pycron/crontab.txt b/_install/dependencies/pycron/crontab.txt
similarity index 100%
rename from vas/_install/dependencies/pycron/crontab.txt
rename to _install/dependencies/pycron/crontab.txt
diff --git a/vas/_install/dependencies/websocket/apache.conf b/_install/dependencies/websocket/apache.conf
similarity index 100%
rename from vas/_install/dependencies/websocket/apache.conf
rename to _install/dependencies/websocket/apache.conf
diff --git a/vas/_install/dependencies/websocket/linux/websocket_vitis b/_install/dependencies/websocket/linux/websocket_vitis
similarity index 100%
rename from vas/_install/dependencies/websocket/linux/websocket_vitis
rename to _install/dependencies/websocket/linux/websocket_vitis
diff --git a/vas/_install/dependencies/websocket/websocket.cfg b/_install/dependencies/websocket/websocket.cfg
similarity index 100%
rename from vas/_install/dependencies/websocket/websocket.cfg
rename to _install/dependencies/websocket/websocket.cfg
diff --git a/vas/_install/dependency.xml b/_install/dependency.xml
similarity index 93%
rename from vas/_install/dependency.xml
rename to _install/dependency.xml
index 7efd2591..f0370de2 100755
--- a/vas/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -3,7 +3,6 @@
<installer>
<schema>
<name>s_vitis</name>
- <version>2018.05.00</version>
<dependenciesCollection>
<dependency>
<name>postgres</name>
diff --git a/client/_install/fileToDelete.txt b/_install/fileToDelete.txt
old mode 100755
new mode 100644
similarity index 100%
rename from client/_install/fileToDelete.txt
rename to _install/fileToDelete.txt
diff --git a/client/_install/folderToDelete.txt b/_install/folderToDelete.txt
old mode 100755
new mode 100644
similarity index 100%
rename from client/_install/folderToDelete.txt
rename to _install/folderToDelete.txt
diff --git a/vas/_install/listModuleApache.txt b/_install/listModuleApache.txt
similarity index 100%
rename from vas/_install/listModuleApache.txt
rename to _install/listModuleApache.txt
diff --git a/client/_install/dependency.xml b/client/_install/dependency.xml
deleted file mode 100755
index d550d0ab..00000000
--- a/client/_install/dependency.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Core -->
-<installer>
- <dependenciesCollection>
- <dependency>
- <nature>vas</nature>
- <version>2018.05.00</version>
- </dependency>
- </dependenciesCollection>
-</installer>
diff --git a/client/_install/listModuleApache.txt b/client/_install/listModuleApache.txt
deleted file mode 100755
index 90a6e693..00000000
--- a/client/_install/listModuleApache.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-alias
-deflate
-headers
-rewrite
-ssl
\ No newline at end of file
--
GitLab
From a7b754eb0a913e3c5d87ffc007025c22d940b333 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Tue, 9 Oct 2018 12:19:49 +0000
Subject: [PATCH 3/5] Update _install/dependency.xml
---
_install/dependency.xml | 102 ++++++++++++++++++++--------------------
1 file changed, 51 insertions(+), 51 deletions(-)
diff --git a/_install/dependency.xml b/_install/dependency.xml
index f0370de2..d24f9bfa 100755
--- a/_install/dependency.xml
+++ b/_install/dependency.xml
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- VAS -->
-<installer>
- <schema>
- <name>s_vitis</name>
- <dependenciesCollection>
- <dependency>
- <name>postgres</name>
- <version>9.3</version>
- <nature>extern-pre</nature>
- </dependency>
- </dependenciesCollection>
- </schema>
- <dependenciesCollection>
- <dependency>
- <name>apache</name>
- <version>2.4.13</version>
- <nature>extern-pre</nature>
- </dependency>
- <dependency>
- <name>pre-install</name>
- <nature>extern-pre</nature>
- </dependency>
- <dependency>
- <name>php</name>
- <nature>extern-post</nature>
- <location>php-7.2.8</location>
- </dependency>
- <!-- Dépendances de PHP -->
- <dependency>
- <name>vcredist</name>
- <nature>extern-pre</nature>
- <location>vcredist-15-64</location>
- </dependency>
- <!-- Fin des dépendances de PHP -->
- <dependency>
- <name>post-install</name>
- <nature>extern-post</nature>
- </dependency>
- <dependency>
- <name>websocket</name>
- <nature>extern-post</nature>
- <location>websocket</location>
- </dependency>
- <dependency>
- <name>pgutils</name>
- <nature>extern-post</nature>
- <location>pgutils</location>
- </dependency>
- </dependenciesCollection>
-</installer>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Vitis -->
+<installer>
+ <schema>
+ <name>s_vitis</name>
+ <dependenciesCollection>
+ <dependency>
+ <name>postgres</name>
+ <version>9.3</version>
+ <nature>extern-pre</nature>
+ </dependency>
+ </dependenciesCollection>
+ </schema>
+ <dependenciesCollection>
+ <dependency>
+ <name>apache</name>
+ <version>2.4.13</version>
+ <nature>extern-pre</nature>
+ </dependency>
+ <dependency>
+ <name>pre-install</name>
+ <nature>extern-pre</nature>
+ </dependency>
+ <dependency>
+ <name>php</name>
+ <nature>extern-post</nature>
+ <location>php-7.2.8</location>
+ </dependency>
+ <!-- Dépendances de PHP -->
+ <dependency>
+ <name>vcredist</name>
+ <nature>extern-pre</nature>
+ <location>vcredist-15-64</location>
+ </dependency>
+ <!-- Fin des dépendances de PHP -->
+ <dependency>
+ <name>post-install</name>
+ <nature>extern-post</nature>
+ </dependency>
+ <dependency>
+ <name>websocket</name>
+ <nature>extern-post</nature>
+ <location>websocket</location>
+ </dependency>
+ <dependency>
+ <name>pgutils</name>
+ <nature>extern-post</nature>
+ <location>pgutils</location>
+ </dependency>
+ </dependenciesCollection>
+</installer>
--
GitLab
From 8c498237872a88d0d218cf7b99653faa641d7b47 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Tue, 9 Oct 2018 12:35:15 +0000
Subject: [PATCH 4/5] Divise les dependances client et vas pour apache
---
_install/{ => client}/fileToDelete.txt | 6 +-
_install/{ => client}/folderToDelete.txt | 14 +--
_install/client/listModuleApache.txt | 5 +
_install/{ => vas}/apache.conf | 138 +++++++++++------------
_install/{ => vas}/listModuleApache.txt | 32 +++---
5 files changed, 100 insertions(+), 95 deletions(-)
rename _install/{ => client}/fileToDelete.txt (98%)
rename _install/{ => client}/folderToDelete.txt (96%)
create mode 100644 _install/client/listModuleApache.txt
rename _install/{ => vas}/apache.conf (96%)
mode change 100755 => 100644
rename _install/{ => vas}/listModuleApache.txt (80%)
mode change 100755 => 100644
diff --git a/_install/fileToDelete.txt b/_install/client/fileToDelete.txt
similarity index 98%
rename from _install/fileToDelete.txt
rename to _install/client/fileToDelete.txt
index 32b675a4..ca3a9114 100644
--- a/_install/fileToDelete.txt
+++ b/_install/client/fileToDelete.txt
@@ -1,4 +1,4 @@
-javascript/externs/formreader/formreader.js
-javascript/externs/formreader/formreaderCtrl.js
-javascript/externs/formreader/formreaderDrtv.js
+javascript/externs/formreader/formreader.js
+javascript/externs/formreader/formreaderCtrl.js
+javascript/externs/formreader/formreaderDrtv.js
javascript/externs/formreader/formreaderSrvc.js
\ No newline at end of file
diff --git a/_install/folderToDelete.txt b/_install/client/folderToDelete.txt
similarity index 96%
rename from _install/folderToDelete.txt
rename to _install/client/folderToDelete.txt
index c0f1c982..a0e7984d 100644
--- a/_install/folderToDelete.txt
+++ b/_install/client/folderToDelete.txt
@@ -1,8 +1,8 @@
-javascript/app
-javascript/require
-javascript/test
-javascript/externs/openLayers/ol
-javascript/externs/openLayers/ol.ext
-javascript/externs/studio/properties
-javascript/externs/studio/javascript
+javascript/app
+javascript/require
+javascript/test
+javascript/externs/openLayers/ol
+javascript/externs/openLayers/ol.ext
+javascript/externs/studio/properties
+javascript/externs/studio/javascript
modules/vitis/javascript
\ No newline at end of file
diff --git a/_install/client/listModuleApache.txt b/_install/client/listModuleApache.txt
new file mode 100644
index 00000000..2c0309e3
--- /dev/null
+++ b/_install/client/listModuleApache.txt
@@ -0,0 +1,5 @@
+alias
+deflate
+headers
+rewrite
+ssl
\ No newline at end of file
diff --git a/_install/apache.conf b/_install/vas/apache.conf
old mode 100755
new mode 100644
similarity index 96%
rename from _install/apache.conf
rename to _install/vas/apache.conf
index bb66dfde..2281b2e2
--- a/_install/apache.conf
+++ b/_install/vas/apache.conf
@@ -1,70 +1,70 @@
-PassEnv TEMP
-Alias /rest[ENV] "[VASDIRECTORY]/rest"
- <Directory "[VASDIRECTORY]/rest">
- <FilesMatch ".+\.ph(p[345]?|t|tml)$">
- SetHandler application/x-httpd-php_vitis[ENV]
- </FilesMatch>
- AllowOverride FileInfo
- Options FollowSymLinks
- Require all granted
- <Files ~ "\.(map|log|inc|php)$">
- Order allow,deny
- Deny from all
- </Files>
- </Directory>
-
-Alias /doc[ENV] "[VASDIRECTORY]/doc"
- <Directory "[VASDIRECTORY]/doc">
- <FilesMatch ".+\.ph(p[345]?|t|tml)$">
- SetHandler application/x-httpd-php_vitis[ENV]
- </FilesMatch>
- AllowOverride FileInfo
- Options FollowSymLinks
- Require all granted
- </Directory>
-
-Alias /public[ENV] "[VASDIRECTORY]/public"
- <Directory "[VASDIRECTORY]/public">
- AllowOverride FileInfo
- Options FollowSymLinks
- Require all granted
- <Files ~ "\.(map|inc|php)$">
- Order allow,deny
- Deny from all
- </Files>
- SetHandler application/x-download
- </Directory>
-Alias /ws_data[ENV] "[VASDIRECTORY]/ws_data"
- <Directory "[VASDIRECTORY]/ws_data">
- AllowOverride All
- Options FollowSymLinks
- Require all granted
- <Files ~ "\.(map|log|inc|php)$">
- Order allow,deny
- Deny from all
- </Files>
- SetHandler application/x-download
- </Directory>
-Alias /proxy[ENV] "[VASDIRECTORY]/util/proxy"
- <Directory "[VASDIRECTORY]/util/proxy">
- <FilesMatch ".+\.ph(p[345]?|t|tml)$">
- SetHandler application/x-httpd-php_vitis[ENV]
- </FilesMatch>
- AllowOverride FileInfo
- Options FollowSymLinks
- Require all granted
- <Files ~ "\.(map|log|inc)$">
- Order allow,deny
- Deny from all
- </Files>
- </Directory>
-Alias /printserver[ENV] "[VASDIRECTORY]/util/printserver"
- <Directory "[VASDIRECTORY]/util/printserver">
- AllowOverride FileInfo
- Options FollowSymLinks
- Require all granted
- <Files ~ "\.(map|log|inc|php)$">
- Order allow,deny
- Deny from all
- </Files>
+PassEnv TEMP
+Alias /rest[ENV] "[VASDIRECTORY]/rest"
+ <Directory "[VASDIRECTORY]/rest">
+ <FilesMatch ".+\.ph(p[345]?|t|tml)$">
+ SetHandler application/x-httpd-php_vitis[ENV]
+ </FilesMatch>
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|log|inc|php)$">
+ Order allow,deny
+ Deny from all
+ </Files>
+ </Directory>
+
+Alias /doc[ENV] "[VASDIRECTORY]/doc"
+ <Directory "[VASDIRECTORY]/doc">
+ <FilesMatch ".+\.ph(p[345]?|t|tml)$">
+ SetHandler application/x-httpd-php_vitis[ENV]
+ </FilesMatch>
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ </Directory>
+
+Alias /public[ENV] "[VASDIRECTORY]/public"
+ <Directory "[VASDIRECTORY]/public">
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|inc|php)$">
+ Order allow,deny
+ Deny from all
+ </Files>
+ SetHandler application/x-download
+ </Directory>
+Alias /ws_data[ENV] "[VASDIRECTORY]/ws_data"
+ <Directory "[VASDIRECTORY]/ws_data">
+ AllowOverride All
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|log|inc|php)$">
+ Order allow,deny
+ Deny from all
+ </Files>
+ SetHandler application/x-download
+ </Directory>
+Alias /proxy[ENV] "[VASDIRECTORY]/util/proxy"
+ <Directory "[VASDIRECTORY]/util/proxy">
+ <FilesMatch ".+\.ph(p[345]?|t|tml)$">
+ SetHandler application/x-httpd-php_vitis[ENV]
+ </FilesMatch>
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|log|inc)$">
+ Order allow,deny
+ Deny from all
+ </Files>
+ </Directory>
+Alias /printserver[ENV] "[VASDIRECTORY]/util/printserver"
+ <Directory "[VASDIRECTORY]/util/printserver">
+ AllowOverride FileInfo
+ Options FollowSymLinks
+ Require all granted
+ <Files ~ "\.(map|log|inc|php)$">
+ Order allow,deny
+ Deny from all
+ </Files>
</Directory>
\ No newline at end of file
diff --git a/_install/listModuleApache.txt b/_install/vas/listModuleApache.txt
old mode 100755
new mode 100644
similarity index 80%
rename from _install/listModuleApache.txt
rename to _install/vas/listModuleApache.txt
index 4e015bb2..c2626d94
--- a/_install/listModuleApache.txt
+++ b/_install/vas/listModuleApache.txt
@@ -1,16 +1,16 @@
-actions
-alias
-cgi
-deflate
-headers
-ldap
-rewrite
-ssl
-proxy
-proxy_ajp
-proxy_connect
-proxy_fcgi
-proxy_ftp
-proxy_http
-proxy_scgi
-proxy_wstunnel
+actions
+alias
+cgi
+deflate
+headers
+ldap
+rewrite
+ssl
+proxy
+proxy_ajp
+proxy_connect
+proxy_fcgi
+proxy_ftp
+proxy_http
+proxy_scgi
+proxy_wstunnel
\ No newline at end of file
--
GitLab
From ddd89b965df8fe0715ee8915813557e78cfc413d Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Tue, 16 Oct 2018 17:48:10 +0200
Subject: [PATCH 5/5] Update from SVN
---
client/CHANGE_LOG.txt | 57 -------------------
client/index.html | 4 +-
client/javascript/app/script_client.js | 52 +++++++----------
.../externs/formReader/formReaderDrtv.js | 2 +
.../externs/formReader/formReaderSrvc.js | 1 +
vas/CHANGE_LOG.txt | 19 -------
6 files changed, 24 insertions(+), 111 deletions(-)
delete mode 100755 client/CHANGE_LOG.txt
mode change 100755 => 100644 client/javascript/app/script_client.js
mode change 100755 => 100644 client/javascript/externs/formReader/formReaderDrtv.js
mode change 100755 => 100644 client/javascript/externs/formReader/formReaderSrvc.js
delete mode 100755 vas/CHANGE_LOG.txt
diff --git a/client/CHANGE_LOG.txt b/client/CHANGE_LOG.txt
deleted file mode 100755
index 5e5ffe45..00000000
--- a/client/CHANGE_LOG.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- + +
- + VEREMES - Vitis Core change log +
- + +
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-
-b21229|AMELIORATION|core| Suppression du champ "ID" dans le filtre de recherche des domaines.
-b21227|AMELIORATION|core| CHANGE_LOG.txt
-b21226|BUG |core| Correction d'un bug dans les filtres de recherche (valeur numérique recherchée dans un champ texte).
-
-b21193|RELEASE |core| Version 2016.05.00
-b21188|BUG |core| Correction d'un bug sur la fonction de clonage d'un enregistrement (cloneSectionForm()).
-b21178|BUG |core| CHANGE_LOG.txt
-b21177|BUG |core| Correction d'un bug sur les formulaires utilisants codemirror (formulaire non modifié).
-b21173|BUG |core| CHANGE_LOG.txt
-b21172|AMELIORATION|core| WorkspaceList : pas de boutons pour une liste dans une section en mode "display".
-b21169|BUG |core| CHANGE_LOG.txt
-b21168|AMELIORATION|core| cloneSectionForm() -> clonage d'un enregistrement.
-b21166|AMELIORATION|core| callFunciton: Si il y a un appel à une fonction dans les paramètres de la fonction
-b21156|AMELIORATION|core| Optimisation images 2
-b21155|AMELIORATION|core| Optimisation chargement des images dans les listes vitis
-b21146|AMELIORATION|core| CHANGE_LOG.txt
-b21145|AMELIORATION|core| setRadioTranslation() -> change la valeur d'un champ radio par sa traduction (pour le mode display).
-b21136|AMELIORATION|core| CHANGE_LOG.txt
-b21135|BUG |core| Correction d'un bug en mode compilé (copyFormValues).
-
-b21063|RELEASE |core| Version 2016.04.00
-b21123|AMELIORATION|core| Edition des dépendances sortie vmap 2016.03
-b21080|AMELIORATION|core| Généralisation du dossier conteneur de fichiers à objets métier ou vitis
-
-b21063|RELEASE |core| Version 2016.03.00
-b21043|AMELIORATION|core| Depuis vMap ouvrir un objet Vitis en édition avec modesSrvc.scope.selectMode, modesSrvc.scope.selectObject, modesSrvc.scope.displayObjectElement, modesSrvc.scope.editObjectElement
-b21004|BUG |core| Module Vitis: l'utilisateur connecté ne peut pas être retiré de la liste des utilisateurs liés au groupe dans l'édition des privilèges "vitis_user" et "vitis_admin".
-b21003|BUG |core| Module Vitis: l'utilisateur connecté ne peut pas supprimer ses privilèges "vitis_user" et "vitis_admin" après rafraichissement de l'application.
-b20998|BUG |core| Module Vitis: l'utilisateur connecté ne peut pas supprimer son compte.
-b20994|AMELIORATION|core| Nouveaux types possibles dans le studio/formReader:Image (Objet métier), Fichier en téléchargement (Objet métier)
-b20962|AMELIORATION|core| FormReader : paramètre "inline" dans un champ "radio" pour l'aligner horizontalement avec le label.
-b20924|AMELIORATION|core| Compilation du formulaire des filtres dès le 1er affichage du formulaire.
-b20923|AMELIORATION|core| FormReader : évènement "formExtracted" déclenché à la fin de l'extraction des valeurs d'un formulaire.
-b20949|AMELIORATION|core| Formreader: Paramètre de type Lien URL
-b20918|BUG |core| Formreader: SetValue pour types liste avec ou sans parent
-b20863|BUG |core| Correction d'un bug dans les filtres de recherche (<select> avec valeur numérique mais colonne de type "string" dans la base).
-b20863|AMELIORATION|core| Selection du mode en passant mode_id dans l'url, de l'objet en pasant object_id, de l'action sur un élément en passant action + ids
-b20863|AMELIORATION|core| FormReader: possibilité de sélectionner les couches à afficher pour les types carte vmap en passant "interactions"."layer_tree" = true
-b20863|BUG |core| vMap admin/couches/getCapabilities: correction du bug contraignant à utiliser un seul étage dans les balises "layer"
-
-b20829|RELEASE |core| Version 2016.02.00
-b20291|BUG |core| Correction d'un bug sur la taille maximale des fichiers de log à afficher.
-b20082|AMELIORATION|core| Tri par ordre alphabétique dans les champs de formulaire "select" et "double_select".
-b20058|BUG |core| Correction d'un bug de connexion avec une session sauvée dans le localStorage (cookie).
-b20053|AMELIORATION|core| Surcharge du paramètre "web_server_name" dans le fichier des properties (conf/properties.json).
-b19968|AMELIORATION|core| Paramètre "web_server_name" des properties à partir des données de l'url.
-b19944|AMELIORATION|core| Suppression du chargement du fichier "properties.json" dans loadApp.js (doublon avec index.html).
-b19935|BUG |core| Suppression du paramètre non utilisé "uiGridConstants" dans la directive formReader.appFormFieldNgRepeatDrtv (erreur avec les widgets de GTF).
-b19984|BUG |core| Correction d'un bug sur la sélection du champ "Nombre de lignes par page" dans le formulaire de configuration.
diff --git a/client/index.html b/client/index.html
index 81e34736..e7c405f0 100755
--- a/client/index.html
+++ b/client/index.html
@@ -4,7 +4,7 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
- <title>Vitis 2018.05</title>
+ <title>Administration</title>
<script src="javascript/externs/jquery/jquery-1.11.3.min.js"></script>
<script src="javascript/externs/mobile-detect/mobile-detect.min.js"></script>
<script src="https://www.google.com/recaptcha/api.js" async defer></script>
@@ -171,4 +171,4 @@
});
</script>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/client/javascript/app/script_client.js b/client/javascript/app/script_client.js
old mode 100755
new mode 100644
index bd0dd762..1f56beac
--- a/client/javascript/app/script_client.js
+++ b/client/javascript/app/script_client.js
@@ -976,41 +976,27 @@ vitisApp.on('appInitCtrlLoaded', function () {
angular.element(vitisApp.appWorkspaceListDrtv).scope()["resetGridFilter"] = function () {
$log.info("resetGridFilter");
var scope = this;
- var oFormData = formSrvc["getFormData"](envSrvc["sFormDefinitionName"], true);
- var aFormElementsKeys = Object.keys(oFormData);
- var i = 0;
- //si il y a des champs date on les reset pour une nouvelle utilisation (sinon conservation de la date précédente)
- while (i < aFormElementsKeys.length) {
- var oFormElement = formSrvc["getFormElementDefinition"](aFormElementsKeys[i], envSrvc["sFormDefinitionName"]);
- if (oFormElement["type"] === "date" || oFormElement["type"] === "datetime")
- angular.element("#" + oFormElement["id"]).data("DateTimePicker").clear();
- i++;
+
+ var sId = envSrvc["oFormDefinition"][envSrvc["sFormDefinitionName"]]["name"];
+
+ if(goog.isDefAndNotNull(envSrvc["oFormDefinition"][envSrvc["sFormDefinitionName"]]["id"])){
+ sId = envSrvc["oFormDefinition"][envSrvc["sFormDefinitionName"]]["id"];
}
- // Valeurs par défaut du formulaire.
- envSrvc["oFormValues"][envSrvc["sFormDefinitionName"]] = angular.copy(envSrvc["oWorkspaceList"][envSrvc["sSelectedGridOptionsName"]]["oDefaultValues"]);
- // Supprime et charge la 1ere page sans filtre.
- envSrvc["oGridOptionsCopy"][envSrvc["sSelectedGridOptionsName"]]["oFilter"] = envSrvc["oDefaultGridOptions"][envSrvc["sSelectedGridOptionsName"]]["oFilter"];
+
+ var oFormReaderScope = angular.element($('#' + sId).children()).scope();
+ oFormReaderScope['oFormValues'][oFormReaderScope['sFormDefinitionName']] = {};
+
+ setTimeout(function () {
+ oFormReaderScope['compileTemplate']();
+ setTimeout(function () {
+ oFormReaderScope['ctrl'].useDefaultValues(true);
+ setTimeout(function () {
+ oFormReaderScope['ctrl'].extractFormDefinitionInfos();
+ }, 100);
+ }, 100);
+ }, 100);
+
scope["setGridFilter"]();
- // 1 seul élément <options> sélectionné.
- $timeout(function () {
- aFormElementsKeys.forEach(function (sFormElementKey) {
- var oFormElementDef = formSrvc["getFormElementDefinition"](sFormElementKey, envSrvc["sFormDefinitionName"]);
- if (oFormElementDef["type"] === "select") {
- document.querySelectorAll("#" + oFormElementDef["id"]).forEach(function (oFormElement) {
- if (typeof (oFormElement["options"]) != "undefined") {
- Array.from(oFormElement["options"]).forEach(function (oOptions) {
- var oSelectValue = envSrvc["oFormValues"][envSrvc["sFormDefinitionName"]][sFormElementKey];
- oOptions.selected = false;
- if (typeof (oSelectValue) == "object" && typeof (oSelectValue["selectedOption"]) == "object") {
- if (oOptions.value == oSelectValue["selectedOption"]["value"])
- oOptions.selected = true;
- }
- });
- }
- });
- }
- });
- });
};
/**
diff --git a/client/javascript/externs/formReader/formReaderDrtv.js b/client/javascript/externs/formReader/formReaderDrtv.js
old mode 100755
new mode 100644
index 8a05fcbc..283bbc43
--- a/client/javascript/externs/formReader/formReaderDrtv.js
+++ b/client/javascript/externs/formReader/formReaderDrtv.js
@@ -2833,6 +2833,8 @@ formReader.module.directive("appSubformGrid", formReader.appSubformGridDrtv);
*/
formReader.appSubformDrtv = function ($compile, $log) {
return {
+ restrict: 'A',
+ scope: true,
link: function (scope, element, attrs) {
$log.log("formReader.appSubformDrtv.link");
diff --git a/client/javascript/externs/formReader/formReaderSrvc.js b/client/javascript/externs/formReader/formReaderSrvc.js
old mode 100755
new mode 100644
index fa87a6bb..6ca6ef29
--- a/client/javascript/externs/formReader/formReaderSrvc.js
+++ b/client/javascript/externs/formReader/formReaderSrvc.js
@@ -1232,6 +1232,7 @@ formReader.formReaderService = function ($translate, $rootScope, $q, $log, $time
* @param {object} oSubformValues
*/
"showModalSubform": function (sModalId, oSubformScope, oSubformDefinition, oSubformDefinitionName, oSubformValues) {
+ $log.log("showModalSubform");
var sToken = this['sToken'];
var oProperties = this['oProperties'];
diff --git a/vas/CHANGE_LOG.txt b/vas/CHANGE_LOG.txt
deleted file mode 100755
index 8641e240..00000000
--- a/vas/CHANGE_LOG.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- + +
- + VEREMES - Vitis Application Server (VAS) change log +
- + +
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-
-b21212|AMELIORATION|vas| Bug upload fichiers avec le même nom
-b21121|AMELIORATION|vas| Edition des dépendances sortie vmap 2016.03
-b21088|AMELIORATION|vas| image carte par défaut
-b21087|AMELIORATION|vas| Ajout des images des services par défaut
-b21080|AMELIORATION|vas| Généralisation du dossier conteneur de fichiers à objets métier ou vitis
-b21001|AMELIORATION|vas| Reprojection Auto des géométries en genericGet quand on spécifie aValues['result_srid']
-b20074|BUG |vas| Correction d'un bug sur le changement de mot de passe d'un utilisateur qui n'a pas le rôle "vitis_admin".
-b20027|BUG |vas| Suppression du paramètre "$(FME_MF_DIR)" à la création d'un projet FME.
-b20008|BUG |vas| Web service Vitis/Logs : token valide et privilège "vitis_admin" obligatoires pour supprimes des fichiers de logs.
-b20000|BUG |vas| Web service Vitis/Logs : suppression des fichiers avec l'extension ".log" et qui sont uniquement dans les répertoires de logs.
-b19970|AMELIORATION|vas| Protocole http ou https dans le paramètre "web_server_name" du fichier "properties_server.inc".
--
GitLab