Subversion Repositories eFlore/Applications.cel

Compare Revisions

Ignore whitespace Rev 813 → Rev 814

/trunk/jrest/services/CelSyndicationObservation.php
206,8 → 206,8
private function getServiceParDefaut() {
// Construction de la requête
$requete = (isset($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' * '.
'FROM cel_inventory '.
(($this->etreFluxAdmin()) ? '' : 'WHERE transmission = 1 ').
'FROM cel_inventory WHERE identifiant like "%@%" '.
(($this->etreFluxAdmin()) ? '' : 'AND transmission = 1 ').
'ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby : 'date_modification DESC').' '.
"LIMIT $this->start,$this->limit ";
262,8 → 262,7
// Construction de la requête
$requete = (isset($this->distinct) ? 'SELECT DISTINCT' : 'SELECT').' * '.
'FROM cel_inventory '.
'WHERE transmission = 1 '.
' AND ';
'WHERE identifiant like "%@%" AND '.(($this->etreFluxAdmin()) ? '' : ' transmission = 1 AND ');
if ($this->estUneRechercheGenerale()) {
$chaine_requete = $_GET['recherche'];
275,7 → 274,7
}
}
$requete = rtrim($requete, 'AND ');
$requete .= 'ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby :
$requete .= ' ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby :
'date_modification DESC, location ASC').' '.
"LIMIT $this->start,$this->limit ";
/trunk/jrest/services/CelSyndicationImage.php
392,9 → 392,9
' INNER JOIN cel_inventory b '.
' ON (a.coi_ce_observation = b.ordre AND a.coi_ce_utilisateur = b.identifiant) '.
' INNER JOIN cel_images c '.
' ON (a.coi_ce_image = c.ci_id_image AND a.coi_ce_utilisateur = c.ci_ce_utilisateur) '.
'WHERE b.transmission = 1 '.
' AND b.identifiant = c.ci_ce_utilisateur '.
' ON (a.coi_ce_image = c.ci_id_image AND a.coi_ce_utilisateur = c.ci_ce_utilisateur) '.
'WHERE '.(($this->etreFluxAdmin()) ? '' : ' b.transmission = 1 AND ').
' b.identifiant = c.ci_ce_utilisateur '.
' AND ';
if ($this->estUneRechercheGenerale()) {
410,7 → 410,6
$requete = rtrim($requete, 'AND ');
$requete .= ' ORDER BY '.(isset($this->orderby) && (!is_null($this->orderby)) ? $this->orderby :
'c.ci_meta_date_ajout DESC').' '."LIMIT $this->start,$this->limit ";
$elements = $this->executerRequete($requete);
 
// Création du contenu