Changeset 74900 in spip-zone

Timestamp:

Aug 23, 2013, 9:18:23 AM (8 years ago)

Author:

abelass@…

Message:

• inclure_spip das charger
• pas de langue pour l'auteur
• tr qui trainait

Location:

_plugins_/selection_d_objets

Files:

• branches/1/formulaires/bouton_objet.php (modified) (2 diffs)
• branches/1/modeles_so/selection_interface_tr.html (modified) (1 diff)
• branches/1/paquet.xml (modified) (1 diff)
• branches/1/selection_objet_pipelines.php (modified) (1 diff)
• trunk/formulaires/bouton_objet.php (modified) (2 diffs)
• trunk/modeles_so/selection_interface_tr.html (modified) (1 diff)
• trunk/paquet.xml (modified) (1 diff)
• trunk/selection_objet_pipelines.php (modified) (1 diff)

_plugins_/selection_d_objets/branches/1/formulaires/bouton_objet.php

@@ -5 +5 @@
 function formulaires_bouton_objet_charger_dist($id_objet,$objet,$langue,$lang='',$objet_dest='rubrique') {
     include_spip('inc/config');
-    
+    include_spip('inc/presentation');    
+    include_spip('inc/layer');      
+     
     //Les objets destinataires choisies
      $special=array('article','rubrique');
@@ -28 +30 @@
     $where=array();
     if(isset($tables[$table_dest]['statut'][0]['publie']))$statut=$tables[$table_dest]['statut'][0]['publie'];
-    if($statut AND $objet_dest !='rubrique')  $where[]='statut='.sql_quote($statut);
     if($objet=='auteur') $where[]='statut !='.sql_quote('5poubelle');
+    elseif($statut AND $objet_dest !='rubrique')  $where[]='statut='.sql_quote($statut);
     if($choisies)$where[]='id_'.$objet_dest.' IN ('.implode(',',$choisies).')';
     if($tables[$table_dest]['field']['lang'] and $lang){

_plugins_/selection_d_objets/branches/1/modeles_so/selection_interface_tr.html

@@ -36 +36 @@
             <a href="[(#URL_ACTION_AUTEUR{ranger,supprimer_ordre-[(#ENV{langue})]-[(#ID_SELECTION_OBJET)]-#ORDRE-[(#OBJET_DEST)]-[(#ENV{id_objet_dest})]}|parametre_url{load,prive/objets/liste/inc-selection_interface})]#selection_objets" class="select"><img src="#CHEMIN{prive/themes/spip/images/item-remove.png}" alt="X" /></a>
         </td>
-    </tr>
 
+

_plugins_/selection_d_objets/branches/1/paquet.xml

@@ -2 +2 @@
         prefix="selection_objet"
         categorie="edition"
-        version="1.9.2"
+        version="1.9.3"
         etat="test"
         compatibilite="[3.0.5;3.0.*]"

_plugins_/selection_d_objets/branches/1/selection_objet_pipelines.php

@@ -85 +85 @@
             if (!$trad_rub=test_plugin_actif('tradrub')) $contexte['langue']=explode(',',lire_config('langues_multilingue'));
             }
+        if($objet=='auteur')$contexte['langue']='';
            $flux["data"] .= recuperer_fond('prive/objets/liste/selection_interface', $contexte);
             }

_plugins_/selection_d_objets/trunk/formulaires/bouton_objet.php

@@ -5 +5 @@
 function formulaires_bouton_objet_charger_dist($id_objet,$objet,$langue,$lang='',$objet_dest='rubrique') {
     include_spip('inc/config');
-    
+    include_spip('inc/presentation');    
+    include_spip('inc/layer');      
+     
     //Les objets destinataires choisies
      $special=array('article','rubrique');
@@ -28 +30 @@
     $where=array();
     if(isset($tables[$table_dest]['statut'][0]['publie']))$statut=$tables[$table_dest]['statut'][0]['publie'];
-    if($statut AND $objet_dest !='rubrique')  $where[]='statut='.sql_quote($statut);
     if($objet=='auteur') $where[]='statut !='.sql_quote('5poubelle');
+    elseif($statut AND $objet_dest !='rubrique')  $where[]='statut='.sql_quote($statut);
     if($choisies)$where[]='id_'.$objet_dest.' IN ('.implode(',',$choisies).')';
     if($tables[$table_dest]['field']['lang'] and $lang){

_plugins_/selection_d_objets/trunk/modeles_so/selection_interface_tr.html

@@ -36 +36 @@
             <a href="[(#URL_ACTION_AUTEUR{ranger,supprimer_ordre-[(#ENV{langue})]-[(#ID_SELECTION_OBJET)]-#ORDRE-[(#OBJET_DEST)]-[(#ENV{id_objet_dest})]}|parametre_url{load,prive/objets/liste/inc-selection_interface})]#selection_objets" class="select"><img src="#CHEMIN{prive/themes/spip/images/item-remove.png}" alt="X" /></a>
         </td>
-    </tr>
 
+

_plugins_/selection_d_objets/trunk/paquet.xml

@@ -2 +2 @@
         prefix="selection_objet"
         categorie="edition"
-        version="1.9.2"
+        version="1.9.3"
         etat="test"
         compatibilite="[3.0.5;3.0.*]"

_plugins_/selection_d_objets/trunk/selection_objet_pipelines.php

@@ -85 +85 @@
             if (!$trad_rub=test_plugin_actif('tradrub')) $contexte['langue']=explode(',',lire_config('langues_multilingue'));
             }
+        if($objet=='auteur')$contexte['langue']='';
            $flux["data"] .= recuperer_fond('prive/objets/liste/selection_interface', $contexte);
             }