diff --git a/json_messages.json.html b/json_messages.json.html
index 5928d09..a7720e0 100644
--- a/json_messages.json.html
+++ b/json_messages.json.html
@@ -3,22 +3,26 @@
[(#ENV{id}|setenv{id_message})]
[{
-"header":{
- "id": "_",
- "date": "Date",
- "formulaire": "Formulaire",
- [(#CONFIG{gamucontact/gamutable_afficher_type}|oui)
- "type": "Type",
- ]
- "objet": "Objet",
- "statut": "Statut",
- "nom": "Expéditeur",
- "email_contact": "Email",
- "telephone": "Tel",
- "message": "Message"
+ "header":{
+ "id": "_",
+ "date": "Date",
+ "origine": "Page origine",
+ "formulaire": "Formulaire",
+ [(#CONFIG{gamucontact/gamutable_afficher_type}|oui)
+ "type": "Type",
+ ]
+ "objet": "Objet",
+ "statut": "Statut",
+ "nom": "Expéditeur",
+ "email_contact": "Email",
+ "telephone": "Tel",
+ "message": "Message"
},
- "crayons":{
- "statut": ""
+ "crayons": {
+ [(#REM)
+ "statut": "message",
+ "nom": "message"
+ ]
},
"ordreCol" : {
"date": "desc"
@@ -32,7 +36,9 @@
]
"email_contact" : "input"
},
- "filtreColValeurs" : {},
+ "filtreColValeurs" : {
+ [(#REM) "statut": "prop" ]
+ },
"classes": {
"id": "w80p",
"objet": "minw150p",
@@ -42,19 +48,41 @@
}
,
-
-[(#SET{message, [(#TEXTE*|couper{150})]
-
- [(#TEXTE*)]
-
-})]
+
+[(#SET{message, [(#TEXTE*|couper{100})]})]
#SET{statut, #LISTE{prepa,prop,publie,poubelle}|str_replace{#LISTE{Brouillon,Proposé,Publié,Poubelle}, #STATUT}}
#SET{formulaire, #TITRE|replace{Formulaire de, ''}}
+[(#SET{origine_, [(#ORIGINE|couper{35})...]})]
+[(#SET{origine, article origine})]
+
+#SET{args,#ID_MESSAGE|concat{-}|concat{#STATUT}}
+[(#SET{statut,
+
+ [(#STATUT|!={publie}|oui)
+
+ ] [(#STATUT|=={publie}|oui)
+
+ ]
+
+})]
{
"html": {
"id": #ID_MESSAGE,
"date": [(#DATE_HEURE|affdate{d/m/Y H:i:s}|json_encode)],
+ "origine": [(#GET{origine}|json_encode)],
"formulaire": [(#GET{formulaire}|json_encode)],
[(#CONFIG{gamucontact/gamutable_afficher_type}|oui)
"type": [(#TYPE|json_encode)],
@@ -69,12 +97,13 @@
"search": {
"id": #ID_MESSAGE,
"date": [(#DATE_HEURE|affdate{Y-m-d H:i:s}|json_encode)],
+ "origine": [(#ORIGINE|json_encode)],
"formulaire": [(#GET{formulaire}|json_encode)],
[(#CONFIG{gamucontact/gamutable_afficher_type}|oui)
"type": [(#TYPE|json_encode)],
]
"objet": [(#OBJET|json_encode)],
- "statut": [(#GET{statut}|json_encode)],
+ "statut": [(#STATUT|json_encode)],
"nom": [(#NOM|json_encode)],
"email_contact": [(#EMAIL_CONTACT|json_encode)],
"telephone": [(#TELEPHONE|json_encode)],
diff --git a/paquet.xml b/paquet.xml
index 0f1f0e0..86764dd 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -6,7 +6,7 @@
compatibilite="[3.2.10;4.*]"
logo="./gamucontact-xx.svg"
documentation=""
- schema="1.0.8"
+ schema="1.0.7"
>
GamuContact