Changeset 10091 in spip-zone

Timestamp:

Mar 3, 2007, 4:11:43 PM (14 years ago)

Author:

cedric@…

Message:

"gerer autoriser modifier dans donnees_tous et l'edition du formulaire (un bug de parenthese !)"

Location:

_plugins_/_stable_/forms/forms_et_tables_1_9_1

Files:

• balise/forms.php (modified) (1 diff)
• exec/template/donnees_tous.html (modified) (1 diff)
• forms_options.php (modified) (1 diff)

_plugins_/_stable_/forms/forms_et_tables_1_9_1/balise/forms.php

@@ -53 +53 @@
         $valeurs = array('0'=>'0');
         $affiche_sondage = '';
-        $formactif = 
+        $formactif = (
           (
                    (_DIR_RESTREINT==_DIR_RESTREINT_ABS && $row['modifiable']=='oui')
-                OR in_array(_request('exec'),$GLOBALS['forms_actif_exec'])
+                  OR in_array(_request('exec'),$GLOBALS['forms_actif_exec'])
                 )
                 AND 
                 (!($id_donnee>0)
-                OR autoriser('modifier','donnee',$id_donnee,NULL,array('id_form'=>$id_form)));
+                  OR autoriser('modifier','donnee',$id_donnee,NULL,array('id_form'=>$id_form))
+                ));
         $formactif = $formactif?' ':'';
 

_plugins_/_stable_/forms/forms_et_tables_1_9_1/exec/template/donnees_tous.html

@@ -40 +40 @@
 <BOUCLE_donnees(FORMS_DONNEES){id_form}{statut IN #ENV*{statuts}}{par rang}{pagination 200}>
 #SET{lien_supp,#URL_ACTION_AUTEUR{forms_donnee_supprime,#ID_FORM:#ID_DONNEE,#EVAL{_DIR_RESTREINT_ABS}|concat{#SELF}|urlencode}}
+#SET{lien_edit,''}
+[(#REM|?{'','modifier'}|autoriser{'donnee',#ID_DONNEE}|?{' '})
 #SET{lien_edit,#URL_ECRIRE{donnees_edit,id_form=#ID_FORM}|parametre_url{id_donnee,#ID_DONNEE}|parametre_url{retour,#SELF} }
+]
         <tr class='tr_liste'>
                 <td>[(#ID_DONNEE|forms_puce_statut_donnee{#STATUT,#ID_FORM})]</td>
-                <td><a href='#GET{lien_edit}'><img src='#EVAL{_DIR_PLUGIN_FORMS}img_pack/loupe.png' alt='' width='16' height='16' style='vertical-align:middle' /></a><a href='#GET{lien_edit}'>#ID_DONNEE</a></td>
+                <td>[<a href='(#GET{lien_edit})'><img src='#EVAL{_DIR_PLUGIN_FORMS}img_pack/loupe.png' alt='' width='16' height='16' style='vertical-align:middle' /></a><a href='#GET{lien_edit}'>]#ID_DONNEE[(#GET{lien_edit}|?{' '})</a>]</td>
                 [(#ENV{affiche_rang,1}|?{' '})<td>#RANG</td>]
                 <BOUCLE_auteur(AUTEURS){id_auteur}>[(#ENV{affiche_de,1}|?{' '})<td>#NOM</td>]</BOUCLE_auteur>[(#ENV{affiche_de,1}|?{' '})<td>#IP</td>]<//B_auteur>

_plugins_/_stable_/forms/forms_et_tables_1_9_1/forms_options.php

@@ -30 +30 @@
 function autoriser_donnee_dist($faire,$type,$id_donnee,$qui,$opt){
         static $types = array();
-        if (!isset($opt['id_form'])){
-                $res = spip_query("SELECT id_form FROM spip_forms_donnees WHERE id_donnee="._q($id_donnee));
+        if (!isset($opt['id_form']) OR !isset($opt['statut'])){
+                $res = spip_query("SELECT id_form,statut FROM spip_forms_donnees WHERE id_donnee="._q($id_donnee));
                 if (!$row = spip_fetch_array($res)) return false;
                 $opt['id_form'] = $row['id_form'];
+                $opt['statut'] = $row['statut'];
         }
         $id_form = $opt['id_form'];