Changeset 79249 in spip-zone

Timestamp:

Dec 9, 2013, 12:58:22 PM (7 years ago)

Author:

severo@…

Message:

Maj de la gestion des champs extras "enlevés".

Diogène permet d'interdire l'édition de certains
champs extras, mais on dirait que le code n'avait
pas suivi les évolutions du plugin Champs Extras. On
rétablit la fonctionnalité.

Location:

_plugins_/diogene/diogene/trunk

Files:

• diogene_autoriser.php (modified) (1 diff)
• formulaires/cextras_diogene_fonctions.php (modified) (1 diff)
• paquet.xml (modified) (1 diff)

_plugins_/diogene/diogene/trunk/diogene_autoriser.php

@@ -293 +293 @@
                                 if(is_array(unserialize($diogene_parent['options_complements'])) && ($complements = unserialize($diogene_parent['options_complements'])) && is_array(unserialize($complements['cextras_enleves']))){
                                         foreach(unserialize($complements['cextras_enleves']) as $enleve){
-                                                if($quoi == $opts['type'].'_'.$enleve){
+                                                if($opts['champ'] == $enleve){
                                                         return false;
                                                 }

_plugins_/diogene/diogene/trunk/formulaires/cextras_diogene_fonctions.php

@@ -21 +21 @@
  */
 function diogene_recuperer_cextras($type){
-        $extras = champs_extras_objet($table);
+        $extras = champs_extras_objet(table_objet_sql($type));
+
         $extras_finaux = array();
         foreach ($extras as $c) {
-                if(preg_match('/\:/',$c->label))
-                        $extras_finaux[$c->champ] = _T($c->label);
+                if(preg_match('/\:/',$c['options']['label']))
+                        $extras_finaux[$c['options']['nom']] = _T($c['options']['label']);
                 else 
-                        $extras_finaux[$c->champ] = typo($c->label);
+                        $extras_finaux[$c['options']['nom']] = typo($c['options']['label']);
         }
         return $extras_finaux;

_plugins_/diogene/diogene/trunk/paquet.xml

@@ -2 +2 @@
         prefix="diogene"
         categorie="edition"
-        version="1.6.5"
+        version="1.6.6"
         etat="stable"
         compatibilite="[3.0.0;3.0.*]"