WebSVN – eFlore/Applications.cel – Path Comparison – /

Ignore whitespace Rev 1397 → Rev 1398

 /trunk/jrest/services/InventoryExport.php
 ,7 → 69,7
             $worksheet->write(0,17,'Identifiant');
             $numero_page = isset($criteres['numero_page']) ? $criteres['numero_page'] : 0;
-            $limite = isset($criteres['limite']) ? $criteres['limite'] : 50;
+            $limite = isset($criteres['limite']) ? $criteres['limite'] : 0;
                         $observations = $chercheur_observations->rechercherObservations($uid[0], $criteres, $numero_page, $limite);

 /trunk/jrest/lib/RechercheObservation.php
 ,8 → 60,9
                 $requete_selection_observations .= $sous_requete_recherche;
                 $requete_selection_observations = rtrim($requete_selection_observations, 'AND ');
-                $requete_selection_observations .= ' ORDER BY id_observation, ordre ';
-                $requete_selection_observations .= ($debut != 0 && $limite != 0) ? 'LIMIT '.$debut.','.$limite : '' ;
+                $requete_selection_observations .= $id_utilisateur == null ? ' ORDER BY id_observation, ordre ' : ' ORDER BY ordre ';
+                $requete_selection_observations .= ($debut == 0 && $limite == 0) ? '' : ' LIMIT '.$debut.','.$limite ;
                 $resultats_observations = array();
                 $resultats_observations = $this->executerRequete($requete_selection_observations);